thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't call getNextItemPtr(), when the result is simply ignored.

Browse source 
svn-id: r27305
This commit is contained in:
Travis Howell 2007-06-10 11:08:12 +00:00
parent ddd1869b13
commit 79c30552ca
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/agos/items.cpp
View file

@ -391,10 +391,8 @@ int AGOSEngine::wordMatch(Item *item, int16 a, int16 n) {
} }
Item *AGOSEngine::derefItem(uint item) { Item *AGOSEngine::derefItem(uint item) {
if (item >= _itemArraySize) { if (item >= _itemArraySize)
debug(1, "derefItem: invalid item %d", item); error("derefItem: invalid item %d", item);
return 0;
}
return _itemArrayPtr[item]; return _itemArrayPtr[item];
} }

6
engines/agos/script_pp.cpp
View file

@ -297,7 +297,7 @@ void AGOSEngine_PuzzlePack::executeOpcode(int opcode) {
void AGOSEngine_PuzzlePack::opp_iconifyWindow() { void AGOSEngine_PuzzlePack::opp_iconifyWindow() {
// 30 // 30
getNextItemPtr(); getNextWord();
if (_clockStopped != 0) if (_clockStopped != 0)
_gameTime += time(NULL) - _clockStopped; _gameTime += time(NULL) - _clockStopped;
_clockStopped = 0; _clockStopped = 0;
@ -308,7 +308,7 @@ void AGOSEngine_PuzzlePack::opp_restoreOopsPosition() {
// 32: restore oops position // 32: restore oops position
uint i; uint i;
getNextItemPtr(); getNextWord();
if (_oopsValid) { if (_oopsValid) {
for (i = 0; i < _numVars; i++) { for (i = 0; i < _numVars; i++) {
@ -328,7 +328,7 @@ void AGOSEngine_PuzzlePack::opp_restoreOopsPosition() {
void AGOSEngine_PuzzlePack::opp_loadMouseImage() { void AGOSEngine_PuzzlePack::opp_loadMouseImage() {
// 38: load mouse image // 38: load mouse image
getNextItemPtr(); getNextWord();
getVarOrByte(); getVarOrByte();
loadMouseImage(); loadMouseImage();
} }