[Scummvm-cvs-logs] SF.net SVN: scummvm:[44282] scummvm/branches/branch-1-0-0/engines/agos
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Thu Sep 24 02:51:43 CEST 2009
Revision: 44282
http://scummvm.svn.sourceforge.net/scummvm/?rev=44282&view=rev
Author: Kirben
Date: 2009-09-24 00:51:42 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
Backport fix for bug #2865191 - NoPatience hangs after undo.
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/engines/agos/agos.h
scummvm/branches/branch-1-0-0/engines/agos/script_pp.cpp
Modified: scummvm/branches/branch-1-0-0/engines/agos/agos.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/agos.h 2009-09-24 00:38:29 UTC (rev 44281)
+++ scummvm/branches/branch-1-0-0/engines/agos/agos.h 2009-09-24 00:51:42 UTC (rev 44282)
@@ -2060,7 +2060,7 @@
void opp_resetGameTime();
void opp_resetPVCount();
void opp_setPathValues();
- void opp_restartClock();
+ void opp_pauseClock();
protected:
typedef void (AGOSEngine_PuzzlePack::*OpcodeProcPuzzlePack) ();
Modified: scummvm/branches/branch-1-0-0/engines/agos/script_pp.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/script_pp.cpp 2009-09-24 00:38:29 UTC (rev 44281)
+++ scummvm/branches/branch-1-0-0/engines/agos/script_pp.cpp 2009-09-24 00:51:42 UTC (rev 44282)
@@ -279,8 +279,8 @@
OPCODE(opp_resetPVCount),
/* 192 */
OPCODE(opp_setPathValues),
- OPCODE(off_stopClock),
- OPCODE(opp_restartClock),
+ OPCODE(off_restartClock),
+ OPCODE(opp_pauseClock),
OPCODE(off_setColour),
};
@@ -311,6 +311,7 @@
uint i;
getNextWord();
+ getNextWord();
if (_oopsValid) {
for (i = 0; i < _numVars; i++) {
@@ -318,12 +319,10 @@
}
i = _variableArray[999] * 100 + 11;
setWindowImage(4,i);
- if (getBitFlag(110)) {
- _gameTime += 10;
- } else {
- // Swampy adventures
- _gameTime += 30;
- }
+ _gameTime += 10;
+ // Swampy adventures
+ if (!getBitFlag(110))
+ _gameTime += 20;
_oopsValid = false;
}
}
@@ -361,12 +360,14 @@
void AGOSEngine_PuzzlePack::opp_loadHiScores() {
// 105: load high scores
getVarOrByte();
+ //loadHiScores();
}
void AGOSEngine_PuzzlePack::opp_checkHiScores() {
// 106: check high scores
getVarOrByte();
getVarOrByte();
+ //checkHiScores();
}
void AGOSEngine_PuzzlePack::opp_sync() {
@@ -390,7 +391,6 @@
// Swampy adventures
saveGame(1, NULL);
}
-
//saveHiScores()
}
@@ -451,11 +451,10 @@
_pathValues[_PVCount++] = getVarOrByte();
}
-void AGOSEngine_PuzzlePack::opp_restartClock() {
- // 194: resume clock
- if (_clockStopped != 0)
- _gameTime += getTime() - _clockStopped;
- _clockStopped = 0;
+void AGOSEngine_PuzzlePack::opp_pauseClock() {
+ // 194: pause clock
+ if (_clockStopped == 0)
+ _clockStopped = getTime();
}
} // End of namespace AGOS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list