[Scummvm-cvs-logs] SF.net SVN: scummvm: [27305] scummvm/trunk/engines/agos
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sun Jun 10 13:08:13 CEST 2007
Revision: 27305
http://scummvm.svn.sourceforge.net/scummvm/?rev=27305&view=rev
Author: Kirben
Date: 2007-06-10 04:08:12 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
Don't call getNextItemPtr(), when the result is simply ignored.
Modified Paths:
--------------
scummvm/trunk/engines/agos/items.cpp
scummvm/trunk/engines/agos/script_pp.cpp
Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp 2007-06-10 10:37:49 UTC (rev 27304)
+++ scummvm/trunk/engines/agos/items.cpp 2007-06-10 11:08:12 UTC (rev 27305)
@@ -391,10 +391,8 @@
}
Item *AGOSEngine::derefItem(uint item) {
- if (item >= _itemArraySize) {
- debug(1, "derefItem: invalid item %d", item);
- return 0;
- }
+ if (item >= _itemArraySize)
+ error("derefItem: invalid item %d", item);
return _itemArrayPtr[item];
}
Modified: scummvm/trunk/engines/agos/script_pp.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_pp.cpp 2007-06-10 10:37:49 UTC (rev 27304)
+++ scummvm/trunk/engines/agos/script_pp.cpp 2007-06-10 11:08:12 UTC (rev 27305)
@@ -297,7 +297,7 @@
void AGOSEngine_PuzzlePack::opp_iconifyWindow() {
// 30
- getNextItemPtr();
+ getNextWord();
if (_clockStopped != 0)
_gameTime += time(NULL) - _clockStopped;
_clockStopped = 0;
@@ -308,7 +308,7 @@
// 32: restore oops position
uint i;
- getNextItemPtr();
+ getNextWord();
if (_oopsValid) {
for (i = 0; i < _numVars; i++) {
@@ -328,7 +328,7 @@
void AGOSEngine_PuzzlePack::opp_loadMouseImage() {
// 38: load mouse image
- getNextItemPtr();
+ getNextWord();
getVarOrByte();
loadMouseImage();
}
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