openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Quiet a warning.

Browse Source
This commit is contained in:
C.W. Betts
2021-10-02 17:18:29 +02:00
committed by Celtic Minstrel
parent 1ce5edaa91
commit 4a25838176
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/boe.appleevents.mm
View File

@@ -44,11 +44,11 @@ void set_up_apple_events(int, char*[]) {
(void) app; // Suppress "unused parameter" warning (void) app; // Suppress "unused parameter" warning
if(file == nil) { if(file == nil) {
std::cerr << "Error: filename was nil" << std::endl; std::cerr << "Error: filename was nil" << std::endl;
return FALSE; return NO;
} }
if(!load_party(file.fileSystemRepresentation, univ)) if(!load_party(file.fileSystemRepresentation, univ))
return FALSE; return NO;
if(!finished_init) { if(!finished_init) {
ae_loading = true; ae_loading = true;
@@ -58,7 +58,7 @@ void set_up_apple_events(int, char*[]) {
end_startup(); end_startup();
if(overall_mode != MODE_STARTUP) if(overall_mode != MODE_STARTUP)
post_load(); post_load();
return TRUE; return YES;
} }
// TODO: Something about the cChoiceDlog causes this to crash... AFTER returning. // TODO: Something about the cChoiceDlog causes this to crash... AFTER returning.

2
src/scenedit/scen.core.cpp
View File

@@ -2455,6 +2455,8 @@ static bool add_shop_entry(cDialog& me, std::string type, cShop& shop, size_t wh
list = STRT_HEALING; list = STRT_HEALING;
prompt = "What kind of healing?"; prompt = "What kind of healing?";
} }
else
return false;
int i = choose_text(list, -1, &me, prompt); int i = choose_text(list, -1, &me, prompt);
if(i == -1) return true; if(i == -1) return true;
if(list == STRT_HEALING) { if(list == STRT_HEALING) {