diff options
author | Strangerke | 2019-08-25 23:24:45 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2019-11-13 22:07:08 +0100 |
commit | 20270594f73d12ff8ce942d5cc01b0205d5c15b4 (patch) | |
tree | 202588d2a5d7f2656e4c26a6431c0bb0d780b520 /engines/griffon/griffon.h | |
parent | 5f8b6851e0871527afdd4fd9e8b9b8cf6d0e08c5 (diff) | |
download | scummvm-rg350-20270594f73d12ff8ce942d5cc01b0205d5c15b4.tar.gz scummvm-rg350-20270594f73d12ff8ce942d5cc01b0205d5c15b4.tar.bz2 scummvm-rg350-20270594f73d12ff8ce942d5cc01b0205d5c15b4.zip |
GRIFFON: Fix some warning in MSVC9 by enforcing the use of float numbers.
Also, add a couple of comments
Diffstat (limited to 'engines/griffon/griffon.h')
-rw-r--r-- | engines/griffon/griffon.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h index 7c1ec28a0f..c533380e6b 100644 --- a/engines/griffon/griffon.h +++ b/engines/griffon/griffon.h @@ -86,7 +86,7 @@ struct PLAYERTYPE { float py; float opx; float opy; - int walkdir; + int walkdir; float walkframe; float walkspd; float attackframe; @@ -94,7 +94,7 @@ struct PLAYERTYPE { int hp; int maxhp; - float hpflash; + float hpflash; int hpflashb; int level; int maxlevel; @@ -102,10 +102,10 @@ struct PLAYERTYPE { int shield; int armour; int foundspell[5]; - float spellcharge[5]; + float spellcharge[5]; int inventory[5]; - float attackstrength; - float spellstrength; + float attackstrength; + float spellstrength; int spelldamage; int sworddamage; @@ -114,7 +114,7 @@ struct PLAYERTYPE { int pause; - float itemselshade; + float itemselshade; int ysort; }; @@ -199,7 +199,7 @@ struct SPELLTYPE { int damagewho; // 0 = npc, 1 = player // for earthslide - float rocky[9]; + float rocky[9]; // CHECKME: Looks unused int rockimg[9]; int rockdeflect[9]; @@ -311,7 +311,7 @@ private: unsigned int clipsurround[4][4]; int fullscreen; - float animspd; + float animspd; // CHECKME: it seems to always be 0.5 int rampdata[40][24]; int curmap; @@ -327,7 +327,7 @@ private: // timer related - move to local later int ticks, tickspassed, nextticks; - float fp, fps, fpsr; + float fp, fps, fpsr; // CHECKME: fp and fps seems to be integers int secsingame, secstart; Graphics::TransparentSurface *mapimg[4]; @@ -335,7 +335,7 @@ private: Common::Rect rcSrc, rcDest; // -----------special case - int dontdrawover; // used in map24 so that the candles dont draw over the boss, default set to 0 + int dontdrawover; // used in map24 so that the candles don't draw over the boss, default set to 0 // saveload info Graphics::TransparentSurface *saveloadimg; |