diff options
| author | Strangerke | 2016-08-14 23:10:31 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | fd1022d722f9c9b5056c3e388479eff24dc54ab0 (patch) | |
| tree | f4530faa2276cc273d87fe4c744432f5784370cf /engines/dm/gfx.h | |
| parent | f866d4a1caa94b91b8def5d3b7bd9ae3ece6eb89 (diff) | |
| download | scummvm-rg350-fd1022d722f9c9b5056c3e388479eff24dc54ab0.tar.gz scummvm-rg350-fd1022d722f9c9b5056c3e388479eff24dc54ab0.tar.bz2 scummvm-rg350-fd1022d722f9c9b5056c3e388479eff24dc54ab0.zip | |
DM: More work on globals
Diffstat (limited to 'engines/dm/gfx.h')
| -rw-r--r-- | engines/dm/gfx.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h index 9c1e2d9334..27abe1192e 100644 --- a/engines/dm/gfx.h +++ b/engines/dm/gfx.h @@ -434,16 +434,14 @@ private: public: CreatureAspect(uint16 uint161, uint16 uint162, byte byte0, byte byte1, byte byte2, byte byte3, byte byte4, byte byte5, byte byte6, byte byte7) - : _firstNativeBitmapRelativeIndex(uint161), - _firstDerivedBitmapIndex(uint162), - _byteWidthFront(byte0), - _heightFront(byte1), - _byteWidthSide(byte2), - _heightSide(byte3), - _byteWidthAttack(byte4), - _heightAttack(byte5), - _coordinateSet_TransparentColor(byte6), - _replacementColorSetIndices(byte7) {} + : _firstNativeBitmapRelativeIndex(uint161), _firstDerivedBitmapIndex(uint162), _byteWidthFront(byte0), + _heightFront(byte1), _byteWidthSide(byte2), _heightSide(byte3), _byteWidthAttack(byte4), + _heightAttack(byte5), _coordinateSet_TransparentColor(byte6), _replacementColorSetIndices(byte7) {} + + CreatureAspect() : + _firstNativeBitmapRelativeIndex(0), _firstDerivedBitmapIndex(0), _byteWidthFront(0), + _heightFront(0), _byteWidthSide(0), _heightSide(0), _byteWidthAttack(0), + _heightAttack(0), _coordinateSet_TransparentColor(0), _replacementColorSetIndices(0) {} byte getCoordSet() { return (_coordinateSet_TransparentColor >> 4) & 0xF; } // @ M71_COORDINATE_SET byte getTranspColour() { return _coordinateSet_TransparentColor & 0xF; } // @ M72_TRANSPARENT_COLOR @@ -462,6 +460,8 @@ public: ObjectAspect(byte firstN, byte firstD, byte byteWidth, byte h, byte grap, byte coord) : _firstNativeBitmapRelativeIndex(firstN), _firstDerivedBitmapRelativeIndex(firstD), _byteWidth(byteWidth), _height(h), _graphicInfo(grap), _coordinateSet(coord) {} + ObjectAspect() : _firstNativeBitmapRelativeIndex(0), _firstDerivedBitmapRelativeIndex(0), + _byteWidth(0), _height(0), _graphicInfo(0), _coordinateSet(0) {} }; // @ OBJECT_ASPECT class ProjectileAspect { @@ -787,7 +787,9 @@ public: byte _projectileScales[7]; ExplosionAspect _explosionAspects[k4_ExplosionAspectCount]; Frame _frameWallD3R2; - Frame g163_FrameWalls[12]; + Frame _frameWalls163[12]; + CreatureAspect _creatureAspects219[k27_CreatureTypeCount]; + ObjectAspect _objectAspects209[k85_ObjAspectCount]; // @ G0209_as_Graphic558_ObjectAspects bool f491_isDerivedBitmapInCache(int16 derivedBitmapIndex); // @ F0491_CACHE_IsDerivedBitmapInCache byte *f492_getDerivedBitmap(int16 derivedBitmapIndex); // @ F0492_CACHE_GetDerivedBitmap |