Game modes cleanup

- Fix some cases where modes were still referenced by number
- Replace most cases of mode range-comparison with is_out(), is_town(), and/or is_combat()

There could be some minor errors in the replacements.
This commit is contained in:
2020-02-04 00:02:08 -05:00
parent 02d98db391
commit 72bd8265fa
12 changed files with 76 additions and 92 deletions

View File

@@ -75,7 +75,7 @@ void set_up_apple_events(int, char*[]) {
return NSTerminateNow;
}
if(overall_mode < MODE_TALK_TOWN || (overall_mode == MODE_STARTUP && party_in_memory)) {
if(overall_mode == MODE_TOWN || overall_mode == MODE_OUTDOORS || (overall_mode == MODE_STARTUP && party_in_memory)) {
std::string choice = cChoiceDlog("quit-confirm-save", {"save", "quit", "cancel"}).show();
if(choice == "cancel") return NSTerminateCancel;
if(choice == "save")