From 85800997c2b7031cd15d9cab6f3f125292483c48 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Sun, 20 Dec 2015 21:08:37 -0600 Subject: [PATCH] Fixed warnings in Xcode --- src/cmdline.c | 2 +- src/input.c | 2 +- src/interface/console.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cmdline.c b/src/cmdline.c index 914042b3ba..003f6faba4 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -109,7 +109,7 @@ int cmdline_run(const char **argv, int argc) int k=0; for (int i=0; i < argc; ++i) if (strcmp(argv[k], "-NSDocumentRevisionsDebugMode") != 0) - mutableArgv[k++] = argv[i]; + mutableArgv[k++] = (char *) argv[i]; argc = k; #else memcpy(mutableArgv,argv,argvsize); diff --git a/src/input.c b/src/input.c index 072948d386..ad246853f4 100644 --- a/src/input.c +++ b/src/input.c @@ -1088,7 +1088,7 @@ void process_mouse_over(int x, int y) if (subWindow == NULL) break; - ebx = ebx & 0xFFFFFF00; + ebx = 0; edi = cursorId; esi = (int)subWindow; // Not sure what this is for, no windows actually implement a handler diff --git a/src/interface/console.c b/src/interface/console.c index 09d6fcce87..5cc3ab962a 100644 --- a/src/interface/console.c +++ b/src/interface/console.c @@ -573,7 +573,7 @@ static int cc_set(const utf8 **argv, int argc) console_execute_silent("get max_loan"); } else if (strcmp(argv[0], "guest_initial_cash") == 0 && invalidArguments(&invalidArgs, double_valid[0])) { - RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_CASH, money16) = clamp(MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(15000, 0)); + RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_CASH, money16) = clamp(MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(1000, 0)); console_execute_silent("get guest_initial_cash"); } else if (strcmp(argv[0], "guest_initial_happiness") == 0 && invalidArguments(&invalidArgs, int_valid[0])) { @@ -633,11 +633,11 @@ static int cc_set(const utf8 **argv, int argc) console_execute_silent("get park_open"); } else if (strcmp(argv[0], "land_rights_cost") == 0 && invalidArguments(&invalidArgs, double_valid[0])) { - RCT2_GLOBAL(RCT2_ADDRESS_LAND_COST, money16) = clamp(MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(15000, 0)); + RCT2_GLOBAL(RCT2_ADDRESS_LAND_COST, money16) = clamp(MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(200, 0)); console_execute_silent("get land_rights_cost"); } else if (strcmp(argv[0], "construction_rights_cost") == 0 && invalidArguments(&invalidArgs, double_valid[0])) { - RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST, money16) = clamp(MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(15000, 0)); + RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST, money16) = clamp(MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(200, 0)); console_execute_silent("get construction_rights_cost"); } else if (strcmp(argv[0], "climate") == 0) {