diff options
| author | Eugene Sandulenko | 2019-11-06 22:23:30 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-13 22:07:08 +0100 |
| commit | 85918451d1e044d52ffc886abc4fa753b00495e3 (patch) | |
| tree | 3cfc0880da46a708a66239dcc90c99089ccba2b7 | |
| parent | 84e6e1b8c506970ff7351515057e30313b013b43 (diff) | |
| download | scummvm-rg350-85918451d1e044d52ffc886abc4fa753b00495e3.tar.gz scummvm-rg350-85918451d1e044d52ffc886abc4fa753b00495e3.tar.bz2 scummvm-rg350-85918451d1e044d52ffc886abc4fa753b00495e3.zip | |
GRIFFON: Fix warning
| -rw-r--r-- | engines/griffon/combat.cpp | 2 | ||||
| -rw-r--r-- | engines/griffon/engine.cpp | 2 | ||||
| -rw-r--r-- | engines/griffon/griffon.h | 2 | ||||
| -rw-r--r-- | engines/griffon/logic.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/griffon/combat.cpp b/engines/griffon/combat.cpp index 2daafd20e0..e23596f15c 100644 --- a/engines/griffon/combat.cpp +++ b/engines/griffon/combat.cpp @@ -112,7 +112,7 @@ void GriffonEngine::attack() { eventText("Found the Temple Key!"); return; case kScriptFindCrystal: - _player.foundSpell[0] = true; + _player.foundSpell[0] = 1; _player.spellCharge[0] = 0; addFloatIcon(7, lx * 16, (ly - 1) * 16); diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp index 5c0a28d791..7a270312dc 100644 --- a/engines/griffon/engine.cpp +++ b/engines/griffon/engine.cpp @@ -278,7 +278,7 @@ void GriffonEngine::newGame() { _player.shield = 0; _player.armour = 0; for (int i = 0; i < 5; i++) { - _player.foundSpell[i] = false; + _player.foundSpell[i] = 0; _player.spellCharge[i] = 0; _player.inventory[i] = 0; } diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h index c6abe7fc2d..6973387b7b 100644 --- a/engines/griffon/griffon.h +++ b/engines/griffon/griffon.h @@ -152,7 +152,7 @@ struct Player { int sword; int shield; int armour; - bool foundSpell[5]; + int foundSpell[5]; float spellCharge[5]; int inventory[5]; float attackStrength; diff --git a/engines/griffon/logic.cpp b/engines/griffon/logic.cpp index 063c5be610..f30de80d16 100644 --- a/engines/griffon/logic.cpp +++ b/engines/griffon/logic.cpp @@ -1643,7 +1643,7 @@ void GriffonEngine::updateSpells() { for (int f1 = 0; f1 < 5; f1++) { if (foundel[f1] && !_player.foundSpell[f1]) { - _player.foundSpell[f1] = true; + _player.foundSpell[f1] = 1; _player.spellCharge[f1] = 0; if (f1 == 1) strcpy(line, "Found... Water Essence"); |