From 5212cdb33376c1ef213bc302aece0695f8a29a12 Mon Sep 17 00:00:00 2001 From: Marco Nett Date: Thu, 28 Jun 2018 22:45:43 +0200 Subject: [PATCH] fixed variable rename oversight; typecasting --- macosx/mac-cheat.cpp | 2 +- macosx/mac-cheatfinder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macosx/mac-cheat.cpp b/macosx/mac-cheat.cpp index 1a61aa6a..88165504 100755 --- a/macosx/mac-cheat.cpp +++ b/macosx/mac-cheat.cpp @@ -273,7 +273,7 @@ static void InitCheatItems (void) static void ImportCheatItems (void) { - int cheat_num = std::min(Cheat.g.size(), MAC_MAX_CHEATS); + int cheat_num = std::min((int)Cheat.g.size(), MAC_MAX_CHEATS); for (unsigned int i = 0; i < cheat_num; i++) { citem[i].valid = true; diff --git a/macosx/mac-cheatfinder.cpp b/macosx/mac-cheatfinder.cpp index 953e841d..e0155ddc 100755 --- a/macosx/mac-cheatfinder.cpp +++ b/macosx/mac-cheatfinder.cpp @@ -1297,7 +1297,7 @@ static void CheatFinderHandleAddEntryButton (WindowData *cf) if (cfAddress[cfListSelection] > (0x20000 - cfViewNumBytes)) PlayAlertSound(); else - if (Cheat.g.size() + cfViewNumBytes > MAX_CHEATS) + if (Cheat.g.size() + cfViewNumBytes > MAC_MAX_CHEATS) AppearanceAlert(kAlertCautionAlert, kS9xMacAlertCFCantAddEntry, kS9xMacAlertCFCantAddEntryHint); else CheatFinderBeginAddEntrySheet(cf);