diff options
author | Ori Avtalion | 2011-02-26 19:38:21 +0200 |
---|---|---|
committer | Ori Avtalion | 2011-02-27 21:25:05 +0200 |
commit | ee3e08bbc2b4b11ce2b96abdabd72a33425b616d (patch) | |
tree | 210d57cd12962b0732fc32994cb6aaacf3613882 | |
parent | d17a88940078f573b843de5a9415feb5292dffc3 (diff) | |
download | scummvm-rg350-ee3e08bbc2b4b11ce2b96abdabd72a33425b616d.tar.gz scummvm-rg350-ee3e08bbc2b4b11ce2b96abdabd72a33425b616d.tar.bz2 scummvm-rg350-ee3e08bbc2b4b11ce2b96abdabd72a33425b616d.zip |
AGOS: Avoid hiding overloaded virtual methods
-rw-r--r-- | engines/agos/agos.h | 2 | ||||
-rw-r--r-- | engines/agos/oracle.cpp | 6 | ||||
-rw-r--r-- | engines/agos/script_ff.cpp | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 7201dfd9d3..9c2a2929e3 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -2018,7 +2018,7 @@ protected: void scrollOracleUp(); void scrollOracleDown(); - void listSaveGames(int n); + void listSaveGamesFeeble(); void saveUserGame(int slot); void windowBackSpace(WindowBlock *window); diff --git a/engines/agos/oracle.cpp b/engines/agos/oracle.cpp index 0a4ab8246f..8ff79965e4 100644 --- a/engines/agos/oracle.cpp +++ b/engines/agos/oracle.cpp @@ -369,7 +369,7 @@ void AGOSEngine_Feeble::swapCharacterLogo() { } } -void AGOSEngine_Feeble::listSaveGames(int n) { +void AGOSEngine_Feeble::listSaveGamesFeeble() { char b[108]; Common::InSaveFile *in; uint16 j, k, z, maxFiles; @@ -377,8 +377,8 @@ void AGOSEngine_Feeble::listSaveGames(int n) { memset(b, 0, 108); maxFiles = countSaveGames() - 1; - j = maxFiles - n + 1; - k = maxFiles - j + 1; + j = maxFiles; + k = 1; z = maxFiles; if (getBitFlag(95)) { j++; diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp index 3198b1b499..dbd89cebf5 100644 --- a/engines/agos/script_ff.cpp +++ b/engines/agos/script_ff.cpp @@ -430,8 +430,7 @@ void AGOSEngine_Feeble::off_loadUserGame() { } void AGOSEngine_Feeble::off_listSaveGames() { - // 134: dummy opcode? - listSaveGames(1); + listSaveGamesFeeble(); } void AGOSEngine_Feeble::off_checkCD() { |