From 4a25838176833c7c9851745ce51e6f6a0aab2599 Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Sat, 2 Oct 2021 17:18:29 +0200 Subject: [PATCH] Quiet a warning. --- src/game/boe.appleevents.mm | 6 +++--- src/scenedit/scen.core.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/game/boe.appleevents.mm b/src/game/boe.appleevents.mm index e1c8d6a1..87d96978 100644 --- a/src/game/boe.appleevents.mm +++ b/src/game/boe.appleevents.mm @@ -44,11 +44,11 @@ void set_up_apple_events(int, char*[]) { (void) app; // Suppress "unused parameter" warning if(file == nil) { std::cerr << "Error: filename was nil" << std::endl; - return FALSE; + return NO; } if(!load_party(file.fileSystemRepresentation, univ)) - return FALSE; + return NO; if(!finished_init) { ae_loading = true; @@ -58,7 +58,7 @@ void set_up_apple_events(int, char*[]) { end_startup(); if(overall_mode != MODE_STARTUP) post_load(); - return TRUE; + return YES; } // TODO: Something about the cChoiceDlog causes this to crash... AFTER returning. diff --git a/src/scenedit/scen.core.cpp b/src/scenedit/scen.core.cpp index 57195398..3daea5cc 100644 --- a/src/scenedit/scen.core.cpp +++ b/src/scenedit/scen.core.cpp @@ -2455,6 +2455,8 @@ static bool add_shop_entry(cDialog& me, std::string type, cShop& shop, size_t wh list = STRT_HEALING; prompt = "What kind of healing?"; } + else + return false; int i = choose_text(list, -1, &me, prompt); if(i == -1) return true; if(list == STRT_HEALING) {