aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sprites_eob.cpp
diff options
context:
space:
mode:
authorathrxx2011-07-18 01:22:58 +0200
committerJohannes Schickel2011-12-26 16:18:12 +0100
commit9140fd8e91882250e23e2e4b44bf3088f3da827a (patch)
tree37deb0048ed88ffff3995ab230535f92cb16842f /engines/kyra/sprites_eob.cpp
parentdb83458330310072c743d5acc7e1a470c888ec3b (diff)
downloadscummvm-rg350-9140fd8e91882250e23e2e4b44bf3088f3da827a.tar.gz
scummvm-rg350-9140fd8e91882250e23e2e4b44bf3088f3da827a.tar.bz2
scummvm-rg350-9140fd8e91882250e23e2e4b44bf3088f3da827a.zip
KYRA: (EOB) - implement party resting
Diffstat (limited to 'engines/kyra/sprites_eob.cpp')
-rw-r--r--engines/kyra/sprites_eob.cpp19
1 files changed, 5 insertions, 14 deletions
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 109d244569..8c492aa4e2 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -224,20 +224,7 @@ void EobCoreEngine::killMonster(EobMonsterInPlay *m, bool giveExperience) {
if (giveExperience)
increasePartyExperience(_monsterProps[m->type].experience);
- if ((_flags.gameID == GI_EOB2) && (_currentLevel == 16) && (_currentSub == 1) && (_monsterProps[m->type].flags & 4)) {
- if (m->type) {
- _playFinale = true;
- _runFlag = false;
- } else {
- m->hitPointsCur = 150;
- m->curRemoteWeapon = 0;
- m->numRemoteAttacks = 255;
- m->shpIndex++;
- m->type++;
- //// TODO
- // dranDragonTransformation();
- }
- } else {
+ if (killMonsterExtra(m)) {
placeMonster(m, 0, -1);
if ((_flags.gameID == GI_EOB1) && (m->type == 21)) {
@@ -250,6 +237,10 @@ void EobCoreEngine::killMonster(EobMonsterInPlay *m, bool giveExperience) {
}
}
+bool EobCoreEngine::killMonsterExtra(EobMonsterInPlay*) {
+ return true;
+}
+
int EobCoreEngine::countSpecificMonsters(int type) {
int res = 0;
for (int i = 0; i < 30; i++) {