diff options
| author | Strangerke | 2016-07-07 23:14:40 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 0a0e79357d2495e376e3be408e0272072a96d233 (patch) | |
| tree | 25378b45f650aa69c99b4b698bc7047dd8260e76 /engines | |
| parent | 89473344d872962dc4ac2c828f6a1c7dfc17867d (diff) | |
| download | scummvm-rg350-0a0e79357d2495e376e3be408e0272072a96d233.tar.gz scummvm-rg350-0a0e79357d2495e376e3be408e0272072a96d233.tar.bz2 scummvm-rg350-0a0e79357d2495e376e3be408e0272072a96d233.zip | |
DM: Fix compilation using MSVC9
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dm/movesens.cpp | 2 | ||||
| -rw-r--r-- | engines/dm/projexpl.cpp | 4 | ||||
| -rw-r--r-- | engines/dm/timeline.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp index 2da2ee054b..80cc1cc204 100644 --- a/engines/dm/movesens.cpp +++ b/engines/dm/movesens.cpp @@ -1072,7 +1072,7 @@ void MovesensMan::f265_createEvent60to61_moveGroup(Thing groupThing, int16 mapX, L0696_s_Event._priority = 0; L0696_s_Event._B._location._mapX = mapX; L0696_s_Event._B._location._mapY = mapY; - L0696_s_Event._C._slot = groupThing; + L0696_s_Event._C._slot = groupThing.toUint16(); _vm->_timeline->f238_addEventGetEventIndex(&L0696_s_Event); } diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp index 5ce7b20fd2..f773ffbc58 100644 --- a/engines/dm/projexpl.cpp +++ b/engines/dm/projexpl.cpp @@ -67,7 +67,7 @@ void ProjExpl::f212_projectileCreate(Thing thing, int16 mapX, int16 mapY, uint16 L0468_s_Event._type = k48_TMEventTypeMoveProjectileIgnoreImpacts; /* Projectiles created by champions or creatures ignore impacts on their first movement */ } L0468_s_Event._priority = 0; - L0468_s_Event._B._slot = L0466_T_ProjectileThing; + L0468_s_Event._B._slot = L0466_T_ProjectileThing.toUint16(); L0468_s_Event._C._projectile.setMapX(mapX); L0468_s_Event._C._projectile.setMapY(mapY); L0468_s_Event._C._projectile.setStepEnergy(stepEnergy); @@ -337,7 +337,7 @@ void ProjExpl::f213_explosionCreate(Thing explThing, uint16 attack, uint16 mapXC M33_setMapAndTime(L0476_s_Event._mapTime, _vm->_dungeonMan->_g272_currMapIndex, _vm->_g313_gameTime + ((explThing == Thing::_explRebirthStep1) ? 5 : 1)); L0476_s_Event._type = k25_TMEventTypeExplosion; L0476_s_Event._priority = 0; - L0476_s_Event._C._slot = L0473_T_Thing; + L0476_s_Event._C._slot = L0473_T_Thing.toUint16(); L0476_s_Event._B._location._mapX = AP0443_ui_ProjectileMapX; L0476_s_Event._B._location._mapY = AP0444_ui_ProjectileMapY; _vm->_timeline->f238_addEventGetEventIndex(&L0476_s_Event); diff --git a/engines/dm/timeline.h b/engines/dm/timeline.h index 1c184e3980..5cf3f85a18 100644 --- a/engines/dm/timeline.h +++ b/engines/dm/timeline.h @@ -109,7 +109,7 @@ public: int16 _attack; int16 _defense; int16 _lightPower; - Thing _slot; + uint16 _slot; // Thing int16 _slotOrdinal; B_unionTimelineEvent() {} } _B; @@ -135,7 +135,7 @@ public: void setStepEnergy(uint16 val) { _backing = (_backing & ~(0xF << 12)) | ((val & 0xF) << 12); } } _projectile; - Thing _slot; + uint16 _slot; int16 _soundIndex; byte _ticks; C_uionTimelineEvent() {} |