Added jsarray.h and jsprvtd.h to Windows include dependencies. Fixed commander's name input on save screen overwriting the saved game timestamp. Fixed an unsigned comparison against 0 in Universe.m, getContainersOfGoods, that was leading to a crash within a few minutes of game time. Replaced js_NewArrayObject call with JS_NewArrayObject to avoid linking error.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1126 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
parent
8dcd9b0056
commit
2a81d2caa1
@ -40,7 +40,7 @@ MA 02110-1301, USA.
|
||||
#define MOREROW 16
|
||||
#define NUMROWS 13
|
||||
#define COLUMNS 2
|
||||
#define INPUTROW 20
|
||||
#define INPUTROW 21
|
||||
#define CDRDESCROW 18
|
||||
#define SAVE_OVERWRITE_WARN_ROW 5
|
||||
#define SAVE_OVERWRITE_YES_ROW 8
|
||||
|
@ -1192,7 +1192,7 @@ JSObject *JSArrayFromNSArray(JSContext *context, NSArray *array)
|
||||
|
||||
if (JSArgumentsFromArray(context, array, &count, &values))
|
||||
{
|
||||
result = js_NewArrayObject(context, count, values);
|
||||
result = JS_NewArrayObject(context, count, values);
|
||||
}
|
||||
if (values != NULL) free(values);
|
||||
|
||||
|
@ -3074,7 +3074,7 @@ GLfloat docked_light_specular[] = { (GLfloat) 1.0, (GLfloat) 1.0, (GLfloat) 0.5,
|
||||
{
|
||||
// choose a random filling
|
||||
// select a random point in the histogram
|
||||
unsigned qr = Ranrot() % total_quantity;
|
||||
int qr = Ranrot() % total_quantity;
|
||||
co_type = 0;
|
||||
while (qr > 0)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user