diff options
| author | Eugene Sandulenko | 2019-08-28 17:03:47 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-13 22:07:08 +0100 |
| commit | 0873e6ef4ed3cbd41214328978cd75b7209b57db (patch) | |
| tree | a353292d800b33af9cd71caec50d38df7f22238a | |
| parent | f00fd96e54722b62fc6fe910fa41f4215e09a924 (diff) | |
| download | scummvm-rg350-0873e6ef4ed3cbd41214328978cd75b7209b57db.tar.gz scummvm-rg350-0873e6ef4ed3cbd41214328978cd75b7209b57db.tar.bz2 scummvm-rg350-0873e6ef4ed3cbd41214328978cd75b7209b57db.zip | |
GRIFFON: Rename data types
| -rw-r--r-- | engines/griffon/griffon.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h index e07b912d7a..75a3eeb011 100644 --- a/engines/griffon/griffon.h +++ b/engines/griffon/griffon.h @@ -92,7 +92,7 @@ enum { #define kEpsilon 0.001 -struct PLAYERTYPE { +struct Player { float px; float py; float opx; @@ -129,7 +129,7 @@ struct PLAYERTYPE { int ysort; }; -struct BODYSECTIONTYPE { +struct BodySection { float x; float y; int parentID; @@ -138,7 +138,7 @@ struct BODYSECTIONTYPE { int bonelength; // the 'bone' that connects the body sections }; -struct NPCTYPE { +struct NPC { float x; float y; int spriteset; @@ -182,7 +182,7 @@ struct NPCTYPE { // one wing and firehydra specific - BODYSECTIONTYPE bodysection[31]; + BodySection bodysection[31]; float swayangle; float swayspd; float headtargetx[4]; @@ -198,7 +198,7 @@ struct NPCTYPE { float floating; }; -struct SPELLTYPE { +struct Spell { int spellnum; float homex; float homey; @@ -227,7 +227,7 @@ struct SPELLTYPE { int npc; }; -struct ANIMSET2TYPE { +struct AnimSet { int x; // xyloc on spriteimageset int y; int xofs; // the actual place to paste the sprite in reference to the bodypart loc on screen @@ -373,13 +373,13 @@ private: int cloudson; // spell info - SPELLTYPE spellinfo[kMaxSpell]; + Spell spellinfo[kMaxSpell]; // player info int movingup, movingdown, movingleft, movingright; - PLAYERTYPE _player; + Player _player; bool attacking; - PLAYERTYPE _playera; + Player _playera; int _asecstart; // tile info @@ -399,7 +399,7 @@ private: float _floaticon[kMaxFloat][4]; // [id] [framesleft, x, y, ico] // special for animset2 - ANIMSET2TYPE _animset2[7], _animset9[7]; + AnimSet _animset2[7], _animset9[7]; // object info float _objectframe[256][2]; @@ -421,7 +421,7 @@ private: int _triggerloc[320][240], _ntriggers; // npc info - NPCTYPE _npcinfo[kMaxNPC]; + NPC _npcinfo[kMaxNPC]; int _lastnpc; // music info |