[Scummvm-cvs-logs] scummvm master -> ee3e08bbc2b4b11ce2b96abdabd72a33425b616d
salty-horse
ori at avtalion.name
Sun Feb 27 20:25:46 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ee3e08bbc2 AGOS: Avoid hiding overloaded virtual methods
Commit: ee3e08bbc2b4b11ce2b96abdabd72a33425b616d
https://github.com/scummvm/scummvm/commit/ee3e08bbc2b4b11ce2b96abdabd72a33425b616d
Author: Ori Avtalion (ori at avtalion.name)
Date: 2011-02-27T11:25:05-08:00
Commit Message:
AGOS: Avoid hiding overloaded virtual methods
Changed paths:
engines/agos/agos.h
engines/agos/oracle.cpp
engines/agos/script_ff.cpp
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 7201dfd..9c2a292 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 0a4ab82..8ff7996 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 3198b1b..dbd89ce 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() {
More information about the Scummvm-git-logs
mailing list