libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

GRIFFON: Made theEnd() work properly

Browse Source
This commit is contained in:
Eugene Sandulenko 2019-11-06 18:25:25 +01:00
parent 6409c3804e
commit dfadc426b7
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/griffon/combat.cpp
View File

@ -1000,8 +1000,10 @@ void GriffonEngine::damageNPC(int npcnum, int damage, int spell) {
}
}
if (_npcInfo[npcnum].script == kScriptEndOfGame)
if (_npcInfo[npcnum].script == kScriptEndOfGame) {
endOfGame();
_gameEnd = true;
}
}
}

7
engines/griffon/engine.cpp
View File

@ -212,9 +212,14 @@ void GriffonEngine::updateEngine() {
while (_itemyloc >= 16)
_itemyloc -= 16;
if (_player.hp <= 0)
if (_player.hp <= 0) {
theEnd();
_gameEnd = true;
return;
}
if (_roomLock) {
_roomLock = false;
for (int i = 1; i <= _lastNpc; i++)

3
engines/griffon/griffon.cpp
View File

@ -125,9 +125,6 @@ Common::Error GriffonEngine::run() {
if (!_shouldQuit && !_gameEnd)
saveLoadNew();
if (_gameEnd)
endOfGame();
}
return Common::kNoError;