XCode build is now completely warning free

This commit is contained in:
2015-06-21 18:22:20 -04:00
parent b7faf52f5e
commit 41fb8bd056
5 changed files with 12 additions and 4 deletions

View File

@@ -1813,7 +1813,6 @@
OTHER_LDFLAGS = (
"-lboost_filesystem",
"-lboost_system",
"-L/usr/local/Cellar/boost/1.57.0/lib",
);
OTHER_LDFLAGS_QUOTED_FOR_PROJECT_1 = "\"$(PROJECT_DIR)/misc/\"";
STRIP_INSTALLED_PRODUCT = NO;
@@ -1870,7 +1869,6 @@
OTHER_LDFLAGS = (
"-lboost_filesystem",
"-lboost_system",
"-L/usr/local/Cellar/boost/1.57.0/lib",
);
OTHER_LDFLAGS_QUOTED_FOR_PROJECT_1 = "\"$(PROJECT_DIR)/misc/\"";
WARNING_CFLAGS = (

View File

@@ -1019,6 +1019,7 @@ bool monst_check_special_terrain(location where_check,short mode,short which_mon
}
switch(ter_abil) {
case eTerSpec::NONE: break;
// changing ter
case eTerSpec::CHANGE_WHEN_STEP_ON:
can_enter = false;
@@ -1051,6 +1052,13 @@ bool monst_check_special_terrain(location where_check,short mode,short which_mon
return univ.town.monst[which_monst].invuln;
}
// TODO: Should it check any other terrain specials?
case eTerSpec::BED: case eTerSpec::BRIDGE: case eTerSpec::CALL_SPECIAL_WHEN_USED: case eTerSpec::CHANGE_WHEN_USED:
case eTerSpec::CONVEYOR: case eTerSpec::CRUMBLING: case eTerSpec::IS_A_CONTAINER: case eTerSpec::IS_A_SIGN:
case eTerSpec::LOCKABLE: case eTerSpec::UNLOCKABLE:
case eTerSpec::UNUSED1: case eTerSpec::UNUSED2: case eTerSpec::UNUSED3:
case eTerSpec::WILDERNESS_CAVE: case eTerSpec::WILDERNESS_SURFACE:
case eTerSpec::CALL_SPECIAL: case eTerSpec::DANGEROUS: // Maybe these two should do something?
break;
}
// Action may change terrain, so update what's been seen

View File

@@ -1247,6 +1247,7 @@ static bool handle_toolpal_action(location cur_point2) {
temp_rect.offset(RIGHT_AREA_UL_X + 5, RIGHT_AREA_UL_Y + terrain_rects[255].bottom + 5);
flash_rect(temp_rect);
switch(cur_palette_buttons[j][i]) {
case PAL_ARROW_UP: case PAL_ARROW_DOWN: // These two might never be used.
case PAL_BLANK: break;
case PAL_PENCIL:
set_string("Drawing mode",scenario.ter_types[current_terrain_type].name);

View File

@@ -24,7 +24,8 @@ extern bool change_made, ae_loading;
@interface AppleEventHandler : NSObject<NSApplicationDelegate>
-(BOOL)application:(NSApplication*) app openFile:(NSString*) file;
-(NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*) sender;
// TODO: Handle quit event by putting up quit dialog
//-(NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*) sender;
@end
void set_up_apple_events(int argc, char* argv[]); // Suppress "no prototype" warning

View File

@@ -510,7 +510,7 @@ void handle_menu_choice(eMenu item_hit) {
if(isEdit) {
if(!cDialog::sendInput(editKey)) {
// Handle non-dialog edit operations here.
switch(editKey.k) {}
// switch(editKey.k) {}
}
}
if(isHelp)