diff options
| author | Strangerke | 2016-07-23 09:45:59 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 185588f098d3982399c74729ad731a68fa1c2454 (patch) | |
| tree | b44d47dc557608109abe33acb80168562fde44ce | |
| parent | 33aac99beeca9f101857aab326a4fc3e0647dc66 (diff) | |
| download | scummvm-rg350-185588f098d3982399c74729ad731a68fa1c2454.tar.gz scummvm-rg350-185588f098d3982399c74729ad731a68fa1c2454.tar.bz2 scummvm-rg350-185588f098d3982399c74729ad731a68fa1c2454.zip | |
DM: Silent some CppCheck warnings in eventman.cpp
| -rw-r--r-- | engines/dm/eventman.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp index d6790b4fcf..dadc931264 100644 --- a/engines/dm/eventman.cpp +++ b/engines/dm/eventman.cpp @@ -1312,13 +1312,6 @@ void EventManager::f70_mouseProcessCommands125To128_clickOnChampionIcon(uint16 c static Box G0622_s_Box_MousePointer_ChampionIcon = Box(0, 18, 0, 13); static byte G0045_auc_Graphic562_PaletteChanges_MousePointerIconShadow[16] = {0, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 0, 120, 120, 120}; - uint16 L0052_ui_ChampionIconIndex; - int16 L0053_i_ChampionIndex; - int16 L0054_i_ChampionIndex; - Box* L0055_pi_ChampionIconBox; - byte* L0056_puc_Bitmap; - - _gK100_preventBuildPointerScreenArea = true; if (!_vm->_eventMan->_g599_useChampionIconOrdinalAsMousePointerBitmap) { if (_vm->_championMan->f285_getIndexInCell(M21_normalizeModulo4(champIconIndex + _vm->_dungeonMan->_g308_partyDir)) == kM1_ChampionNone) { @@ -1328,9 +1321,9 @@ void EventManager::f70_mouseProcessCommands125To128_clickOnChampionIcon(uint16 c _vm->_eventMan->_g598_mousePointerBitmapUpdated = true; _vm->_eventMan->_g599_useChampionIconOrdinalAsMousePointerBitmap = true; _vm->_displayMan->_g578_useByteBoxCoordinates = false; - L0056_puc_Bitmap = _gK190_mousePointerTempBuffer; + byte *L0056_puc_Bitmap = _gK190_mousePointerTempBuffer; memset(L0056_puc_Bitmap, 0, 32 * 18); - L0055_pi_ChampionIconBox = &g54_BoxChampionIcons[champIconIndex]; + Box *L0055_pi_ChampionIconBox = &g54_BoxChampionIcons[champIconIndex]; _vm->_displayMan->f132_blitToBitmap(_vm->_displayMan->_g348_bitmapScreen, L0056_puc_Bitmap, G0621_s_Box_MousePointer_ChampionIconShadow, L0055_pi_ChampionIconBox->_x1, L0055_pi_ChampionIconBox->_y1, k160_byteWidthScreen, k16_byteWidth, k0_ColorBlack, 200, 18); @@ -1342,14 +1335,14 @@ void EventManager::f70_mouseProcessCommands125To128_clickOnChampionIcon(uint16 c _vm->_eventMan->_g599_useChampionIconOrdinalAsMousePointerBitmap = _vm->M0_indexToOrdinal(champIconIndex); } else { _vm->_eventMan->_g598_mousePointerBitmapUpdated = true; - L0052_ui_ChampionIconIndex = _vm->M1_ordinalToIndex(_vm->_eventMan->_g599_useChampionIconOrdinalAsMousePointerBitmap); + uint16 L0052_ui_ChampionIconIndex = _vm->M1_ordinalToIndex(_vm->_eventMan->_g599_useChampionIconOrdinalAsMousePointerBitmap); _vm->_eventMan->_g599_useChampionIconOrdinalAsMousePointerBitmap = _vm->M0_indexToOrdinal(kM1_ChampionNone); - L0054_i_ChampionIndex = _vm->_championMan->f285_getIndexInCell(M21_normalizeModulo4(L0052_ui_ChampionIconIndex + _vm->_dungeonMan->_g308_partyDir)); + int16 L0054_i_ChampionIndex = _vm->_championMan->f285_getIndexInCell(M21_normalizeModulo4(L0052_ui_ChampionIconIndex + _vm->_dungeonMan->_g308_partyDir)); if (L0052_ui_ChampionIconIndex == champIconIndex) { setFlag(_vm->_championMan->_gK71_champions[L0054_i_ChampionIndex]._attributes, k0x0400_ChampionAttributeIcon); _vm->_championMan->f292_drawChampionState((ChampionIndex)L0054_i_ChampionIndex); } else { - L0053_i_ChampionIndex = _vm->_championMan->f285_getIndexInCell(M21_normalizeModulo4(champIconIndex + _vm->_dungeonMan->_g308_partyDir)); + int16 L0053_i_ChampionIndex = _vm->_championMan->f285_getIndexInCell(M21_normalizeModulo4(champIconIndex + _vm->_dungeonMan->_g308_partyDir)); if (L0053_i_ChampionIndex >= 0) { _vm->_championMan->_gK71_champions[L0053_i_ChampionIndex]._cell = (ViewCell)M21_normalizeModulo4(L0052_ui_ChampionIconIndex + _vm->_dungeonMan->_g308_partyDir); setFlag(_vm->_championMan->_gK71_champions[L0053_i_ChampionIndex]._attributes, k0x0400_ChampionAttributeIcon); |