diff options
| author | Johannes Schickel | 2012-01-29 16:15:27 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2012-01-29 16:26:20 +0100 |
| commit | f11b52a097912cfc24728259150c00227167df38 (patch) | |
| tree | 7d268143e76d2e1ff378f693e3c726ece5b74a92 /engines | |
| parent | 00cc48f83dc28295fb4fb449b5c6ad64219e300a (diff) | |
| download | scummvm-rg350-f11b52a097912cfc24728259150c00227167df38.tar.gz scummvm-rg350-f11b52a097912cfc24728259150c00227167df38.tar.bz2 scummvm-rg350-f11b52a097912cfc24728259150c00227167df38.zip | |
KYRA: Prevent unnecessary removal of const in some casts.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/gui_eob.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/staticres_eob.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp index 611eab1bff..5c2c3e5f33 100644 --- a/engines/kyra/gui_eob.cpp +++ b/engines/kyra/gui_eob.cpp @@ -3781,7 +3781,7 @@ void GUI_EoB::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil if (!b) return; - EoBMenuButtonDef *d = (EoBMenuButtonDef *)b->extButtonDef; + const EoBMenuButtonDef *d = (const EoBMenuButtonDef *)b->extButtonDef; if (d->flags & 1) drawMenuButtonBox(b->x, b->y, b->width, b->height, clicked, noFill); diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp index ce43d22362..638a185367 100644 --- a/engines/kyra/staticres_eob.cpp +++ b/engines/kyra/staticres_eob.cpp @@ -369,13 +369,13 @@ void EoBCoreEngine::initStaticResource() { _mnWord = _staticres->loadStrings(kEoBBaseManWord, _mnNumWord); _mnPrompt = _staticres->loadStrings(kEoBBaseManPrompt, temp); - _monsterStepTable0 = (int8 *)_staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp); - _monsterStepTable1 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp); - _monsterStepTable2 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp); - _monsterStepTable3 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp); + _monsterStepTable0 = (const int8 *)_staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp); + _monsterStepTable1 = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp); + _monsterStepTable2 = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp); + _monsterStepTable3 = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp); _monsterCloseAttPosTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttPosTable1, temp); _monsterCloseAttPosTable2 = _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterCloseAttPosTable22 : kEoBBaseMonsterCloseAttPosTable21, temp); - _monsterCloseAttUnkTable = (int8 *)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp); + _monsterCloseAttUnkTable = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp); _monsterCloseAttChkTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable1, temp); _monsterCloseAttChkTable2 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable2, temp); _monsterCloseAttDstTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttDstTable1, temp); |