aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/griffon/dialogs.cpp1
-rw-r--r--engines/griffon/engine.cpp2
-rw-r--r--engines/griffon/input.cpp5
-rw-r--r--engines/griffon/resources.cpp6
4 files changed, 14 insertions, 0 deletions
diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp
index 847377a024..be21015522 100644
--- a/engines/griffon/dialogs.cpp
+++ b/engines/griffon/dialogs.cpp
@@ -48,6 +48,7 @@ namespace Griffon {
void GriffonEngine::title(int mode) {
float xofs = 0;
+ _itemyloc = 0;
bool exitTitle = false;
rcSrc.left = 0;
diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp
index a1eb5139ac..1f4b7cfe94 100644
--- a/engines/griffon/engine.cpp
+++ b/engines/griffon/engine.cpp
@@ -54,6 +54,7 @@ void Player::reset() {
hp = 0;
maxHp = 0;
hpflash = 0;
+ hpflashb = 0;
level = 0;
maxLevel = 0;
sword = 0;
@@ -65,6 +66,7 @@ void Player::reset() {
inventory[i] = 0;
}
attackStrength = 0;
+ itemselshade = 0;
spellDamage = 0;
swordDamage = 0;
exp = 0;
diff --git a/engines/griffon/input.cpp b/engines/griffon/input.cpp
index 64c260b9c4..5caa5af99b 100644
--- a/engines/griffon/input.cpp
+++ b/engines/griffon/input.cpp
@@ -618,6 +618,11 @@ void GriffonEngine::checkTrigger() {
_canUseKey = false;
+ for (int i = 0; i < kMaxFloat; i++) {
+ _floatText[i].framesLeft = 0;
+ _floatIcon[i].framesLeft = 0;
+ }
+
if (_triggerLoc[lx][ly] > -1)
processTrigger(_triggerLoc[lx][ly]);
}
diff --git a/engines/griffon/resources.cpp b/engines/griffon/resources.cpp
index 40f98223ea..4ce1c5d12d 100644
--- a/engines/griffon/resources.cpp
+++ b/engines/griffon/resources.cpp
@@ -192,6 +192,12 @@ void GriffonEngine::loadMap(int mapnum) {
_spellInfo[i].frame = 0;
_roomLock = false;
+ _saidLocked = false;
+ _saidJammed = false;
+ _itemSelOn = false;
+ _selEnemyOn = false;
+ _curItem = 0;
+ _player.itemselshade = 0;
char name[256];
// read *.map file