libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

DM: Fix compilation using MSVC9

Browse Source
This commit is contained in:
Strangerke 2016-07-07 23:14:40 +02:00 committed by Bendegúz Nagy
parent 89473344d8
commit 0a0e79357d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/dm/movesens.cpp
View File

@ -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);
}

4
engines/dm/projexpl.cpp
View File

@ -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);

4
engines/dm/timeline.h
View File

@ -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() {}