diff options
| author | WinterGrascph | 2016-05-15 18:59:55 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | f21a9197a629fcb225c1c47bb2a9f4cd3018c395 (patch) | |
| tree | 502d5749c1c8e83b2801a14c0a6919f6e80bb8a0 /engines/dm/gfx.h | |
| parent | 73a7cba58921e59cdd3049f57b0a3990e7422ea2 (diff) | |
| download | scummvm-rg350-f21a9197a629fcb225c1c47bb2a9f4cd3018c395.tar.gz scummvm-rg350-f21a9197a629fcb225c1c47bb2a9f4cd3018c395.tar.bz2 scummvm-rg350-f21a9197a629fcb225c1c47bb2a9f4cd3018c395.zip | |
DM: Fix file loading dependancy
Diffstat (limited to 'engines/dm/gfx.h')
| -rw-r--r-- | engines/dm/gfx.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h index 4c6b461446..576d9e3452 100644 --- a/engines/dm/gfx.h +++ b/engines/dm/gfx.h @@ -77,28 +77,28 @@ extern Viewport gDungeonViewport; class DisplayMan { - DMEngine *_vm; + DMEngine *_vm = NULL; uint16 _screenWidth; - uint16 _screenHeight; - byte *_vgaBuffer; + uint16 _screenHeight = 0; + byte *_vgaBuffer = NULL; /// Related to graphics.dat file - uint16 grapItemCount; // @ G0632_ui_GraphicCount - uint32 *_packedItemPos; - byte *_packedBitmaps; - byte **_bitmaps; + uint16 grapItemCount = 0; // @ G0632_ui_GraphicCount + uint32 *_packedItemPos = NULL; + byte *_packedBitmaps = NULL; + byte **_bitmaps = NULL; // the last two pointers are owned by this array byte *_wallSetBitMaps[15] = {NULL}; // @G[0696..0710]_puc_Bitmap_WallSet_... // pointers are not owned by these fields - byte *_floorBitmap; - byte *_ceilingBitmap; + byte *_floorBitmap = NULL; + byte *_ceilingBitmap = NULL; - byte *_palChangesProjectile[4]; // @G0075_apuc_PaletteChanges_Projectile + byte *_palChangesProjectile[4] = {NULL}; // @G0075_apuc_PaletteChanges_Projectile DisplayMan(const DisplayMan &other); // no implementation on purpose @@ -152,17 +152,17 @@ public: int16 _championPortraitOrdinal = 0; // @ G0289_i_DungeonView_ChampionPortraitOrdinal - int16 _currMapAlcoveOrnIndices[kAlcoveOrnCount]; // @ G0267_ai_CurrentMapAlcoveOrnamentIndices - int16 _currMapFountainOrnIndices[kFountainOrnCount]; // @ G0268_ai_CurrentMapFountainOrnamentIndices - int16 _currMapWallOrnInfo[16][2]; // @ G0101_aai_CurrentMapWallOrnamentsInf - int16 _currMapFloorOrnInfo[16][2]; // @ G0102_aai_CurrentMapFloorOrnamentsInfo - int16 _currMapDoorOrnInfo[17][2]; // @ G0103_aai_CurrentMapDoorOrnamentsInfo - byte *_currMapAllowedCreatureTypes; // @ G0264_puc_CurrentMapAllowedCreatureTypes - byte _currMapWallOrnIndices[16]; // @ G0261_auc_CurrentMapWallOrnamentIndices - byte _currMapFloorOrnIndices[16]; // @ G0262_auc_CurrentMapFloorOrnamentIndices - byte _currMapDoorOrnIndices[18]; // @ G0263_auc_CurrentMapDoorOrnamentIndices - - int16 _currMapViAltarIndex; // @ G0266_i_CurrentMapViAltarWallOrnamentIndex + int16 _currMapAlcoveOrnIndices[kAlcoveOrnCount] = {0}; // @ G0267_ai_CurrentMapAlcoveOrnamentIndices + int16 _currMapFountainOrnIndices[kFountainOrnCount] = {0}; // @ G0268_ai_CurrentMapFountainOrnamentIndices + int16 _currMapWallOrnInfo[16][2] = {0}; // @ G0101_aai_CurrentMapWallOrnamentsInf + int16 _currMapFloorOrnInfo[16][2] = {0}; // @ G0102_aai_CurrentMapFloorOrnamentsInfo + int16 _currMapDoorOrnInfo[17][2] = {0}; // @ G0103_aai_CurrentMapDoorOrnamentsInfo + byte *_currMapAllowedCreatureTypes = NULL; // @ G0264_puc_CurrentMapAllowedCreatureTypes + byte _currMapWallOrnIndices[16] = {0}; // @ G0261_auc_CurrentMapWallOrnamentIndices + byte _currMapFloorOrnIndices[16] = {0}; // @ G0262_auc_CurrentMapFloorOrnamentIndices + byte _currMapDoorOrnIndices[18] = {0}; // @ G0263_auc_CurrentMapDoorOrnamentIndices + + int16 _currMapViAltarIndex = 0; // @ G0266_i_CurrentMapViAltarWallOrnamentIndex }; } |