diff options
| author | Bendegúz Nagy | 2016-07-11 16:20:55 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 81a8c8cf742314d12850163ff7ffba48f1837bac (patch) | |
| tree | 0b7ed824d4f67e56ebda390d3ee371300cd77e1d | |
| parent | ad11a4f48ce9fbc3547a69870ba7a08dbeff2c08 (diff) | |
| download | scummvm-rg350-81a8c8cf742314d12850163ff7ffba48f1837bac.tar.gz scummvm-rg350-81a8c8cf742314d12850163ff7ffba48f1837bac.tar.bz2 scummvm-rg350-81a8c8cf742314d12850163ff7ffba48f1837bac.zip | |
DM: Clear some warnings
| -rw-r--r-- | engines/dm/projexpl.cpp | 10 | ||||
| -rw-r--r-- | engines/dm/timeline.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp index e8464aab8d..7d99b97648 100644 --- a/engines/dm/projexpl.cpp +++ b/engines/dm/projexpl.cpp @@ -428,8 +428,8 @@ void ProjExpl::f219_processEvents48To49_projectile(TimelineEvent* event) { int16 L0523_i_DestinationMapX; int16 L0524_i_DestinationMapY; uint16 L0518_ui_Cell; - int16 L0525_i_SourceMapX; - int16 L0526_i_SourceMapY; + int16 L0525_i_SourceMapX = -1; + int16 L0526_i_SourceMapY = -1; TimelineEvent L0527_s_Event; @@ -503,8 +503,8 @@ void ProjExpl::f219_processEvents48To49_projectile(TimelineEvent* event) { void ProjExpl::f220_explosionProcessEvent25_explosion(TimelineEvent* event) { Explosion* L0532_ps_Explosion; - Group* L0533_ps_Group; - CreatureInfo* L0534_ps_CreatureInfo; + Group* L0533_ps_Group = nullptr; + CreatureInfo* L0534_ps_CreatureInfo = nullptr; uint16 L0528_ui_MapX; uint16 L0529_ui_MapY; int16 L0530_i_Attack; @@ -513,7 +513,7 @@ void ProjExpl::f220_explosionProcessEvent25_explosion(TimelineEvent* event) { #define AL0531_i_CreatureCount L0531_i_Multiple Thing L0535_T_GroupThing; Thing L0536_T_ExplosionThing; - uint16 L0537_ui_Multiple; + uint16 L0537_ui_Multiple = 0; #define AL0537_ui_CreatureType L0537_ui_Multiple #define AL0537_ui_NonMaterialAdditionalAttack L0537_ui_Multiple bool L0538_B_ExplosionOnPartySquare; diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp index ed3b33093b..2e2a249c17 100644 --- a/engines/dm/timeline.cpp +++ b/engines/dm/timeline.cpp @@ -330,8 +330,8 @@ T0261053: } bool Timeline::f240_isFirstEventExpiered() { - warning(false, "possibly dangerous cast to int32"); - return (_vm->_timeline->_g372_eventCount && ((int32)M30_time(_vm->_timeline->_g370_events[_vm->_timeline->_g371_timeline[0]]._mapTime) <= _vm->_g313_gameTime)); + warning(false, "possibly dangerous cast to uint32"); + return (_vm->_timeline->_g372_eventCount && ((uint32)M30_time(_vm->_timeline->_g370_events[_vm->_timeline->_g371_timeline[0]]._mapTime) <= _vm->_g313_gameTime)); } void Timeline::f239_timelineExtractFirstEvent(TimelineEvent* event) { |