aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v2.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-03-17 23:27:33 +0000
committerJohannes Schickel2008-03-17 23:27:33 +0000
commit845d65d8b73e2b7f3edf3fe50ac5b9bc3ce157e6 (patch)
treeb6ae9fd0d06c2c9a57d71e0dfc6f1ccb236e93f0 /engines/kyra/kyra_v2.cpp
parent1042c6dccf9fd34a80990335420f6ef6dd2d4d1f (diff)
downloadscummvm-rg350-845d65d8b73e2b7f3edf3fe50ac5b9bc3ce157e6.tar.gz
scummvm-rg350-845d65d8b73e2b7f3edf3fe50ac5b9bc3ce157e6.tar.bz2
scummvm-rg350-845d65d8b73e2b7f3edf3fe50ac5b9bc3ce157e6.zip
Implemented opcode 98: o2_setDeathHandlerFlag
svn-id: r31168
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
-rw-r--r--engines/kyra/kyra_v2.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index d10e501273..4d8fdde58d 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -130,6 +130,8 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags) : KyraEngi
_mainCharacter.dlgIndex = 0;
setNewDlgIndex(-1);
+ _deathHandler = -1;
+
_bookMaxPage = 6;
_bookCurPage = 0;
_bookNewPage = 0;
@@ -387,7 +389,7 @@ void KyraEngine_v2::runLoop() {
_quitFlag = false;
while (!_quitFlag) {
- //if (_unk1 >= 0) {
+ //if (_deathHandler >= 0) {
// removeHandItem();
// waitTicks(5);
// sub_270A0();
@@ -514,7 +516,7 @@ void KyraEngine_v2::handleInput(int x, int y) {
}
}
- //if (_unk1 <= -1)
+ //if (_deathHandler <= -1)
// skipHandling = 1;
if (skipHandling)
@@ -545,7 +547,7 @@ void KyraEngine_v2::handleInput(int x, int y) {
}
bool KyraEngine_v2::handleInputUnkSub(int x, int y) {
- if (y > 143/* || _unk1 > -1 */|| queryGameFlag(0x164))
+ if (y > 143 || _deathHandler > -1 || queryGameFlag(0x164))
return false;
if (_handItemSet <= -3 && findItem(_mainCharacter.sceneId, 13) >= 0) {