[Scummvm-cvs-logs] scummvm master -> bbb83f132b23b6a45eb6d979172264c1587f227a
lordhoto
lordhoto at gmail.com
Mon Nov 19 13:11:39 CET 2012
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b7e04fa518 KYRA: Some formatting fixes.
6437aa2c92 KYRA: Strip trailing whitespaces.
dd551c4775 KYRA: Make more static data tables const.
bbb83f132b KYRA: Make "const type *const" use consistent.
Commit: b7e04fa518b998081cb32edbb2f35d436b0d70b9
https://github.com/scummvm/scummvm/commit/b7e04fa518b998081cb32edbb2f35d436b0d70b9
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-11-19T03:54:42-08:00
Commit Message:
KYRA: Some formatting fixes.
Powered by astyle.
Changed paths:
engines/kyra/darkmoon.h
engines/kyra/eob.h
engines/kyra/gui_eob.cpp
engines/kyra/gui_eob.h
engines/kyra/kyra_rpg.h
engines/kyra/saveload_eob.cpp
engines/kyra/screen_eob.cpp
engines/kyra/screen_eob.h
engines/kyra/script_eob.h
engines/kyra/sequences_eob.cpp
engines/kyra/staticres_eob.cpp
diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h
index f6e7b3e..a61990a 100644
--- a/engines/kyra/darkmoon.h
+++ b/engines/kyra/darkmoon.h
@@ -140,7 +140,7 @@ private:
static const uint8 _egaDefaultPalette[];
};
-} // End of namespace Kyra
+} // End of namespace Kyra
#endif
diff --git a/engines/kyra/eob.h b/engines/kyra/eob.h
index 37ce483..bf5440b 100644
--- a/engines/kyra/eob.h
+++ b/engines/kyra/eob.h
@@ -99,7 +99,7 @@ private:
void turnUndeadAuto();
void turnUndeadAutoHit();
- const char * const *_turnUndeadString;
+ const char *const *_turnUndeadString;
// Misc
bool checkPartyStatusExtra();
@@ -113,8 +113,7 @@ private:
static const uint8 _egaDefaultPalette[];
};
-
-} // End of namespace Kyra
+} // End of namespace Kyra
#endif
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 6668644..4f241e7 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -321,7 +321,7 @@ void EoBCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
break;
}
- int textColor= (_configRenderMode == Common::kRenderCGA) ? 2 : 15;
+ int textColor = (_configRenderMode == Common::kRenderCGA) ? 2 : 15;
if (!tmpStr2.empty()) {
_screen->printText(tmpStr.c_str(), x + (16 - tmpStr.size() * 3), y + 2, textColor, 0);
@@ -485,7 +485,7 @@ void EoBCoreEngine::gui_drawInventoryItem(int slot, int special, int pageNum) {
uint8 col1 = guiSettings()->colors.frame1;
uint8 col2 = guiSettings()->colors.frame2;
- if (_configRenderMode == Common::kRenderCGA ) {
+ if (_configRenderMode == Common::kRenderCGA) {
col1 = 1;
col2 = 3;
}
@@ -1568,8 +1568,8 @@ int GUI_EoB::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
// UNUSED
//if (buttonList->flags2 & 0x20) {
- //if (_processButtonListExtraCallback)
- // this->*_processButtonListExtraCallback(buttonList);
+ // if (_processButtonListExtraCallback)
+ // this->*_processButtonListExtraCallback(buttonList);
//}
if (buttonList->nextButton)
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index f6be18f..1b7bdf3 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -156,7 +156,7 @@ private:
static const uint8 _highlightColorTableEGA[];
};
-} // End of namespace Kyra
+} // End of namespace Kyra
#endif // ENABLE_EOB
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index f4678e3..2615875 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -380,7 +380,7 @@ protected:
bool lineIsPassable(int, int) { return false; }
};
-} // End of namespace Kyra
+} // End of namespace Kyra
#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 7f20c12..70c690e 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -680,7 +680,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(Common::String &file) {
in.skip(4);
delete[] c->faceShape;
c->faceShape = 0;
- in.read(c->mageSpells, (_flags.gameID == GI_EOB1) ? 30 :80);
+ in.read(c->mageSpells, (_flags.gameID == GI_EOB1) ? 30 : 80);
in.read(c->clericSpells, (_flags.gameID == GI_EOB1) ? 30 : 80);
c->mageSpellsAvailableFlags = in.readUint32();
for (int ii = 0; ii < 27; ii++)
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 8f18c5a..7cb5050 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -255,7 +255,7 @@ void Screen_EoB::convertPage(int srcPage, int dstPage, const uint8 *cgaMapping)
if (cgaMapping)
generateCGADitheringTables(cgaMapping);
- uint16 *d = (uint16*)dst;
+ uint16 *d = (uint16 *)dst;
uint8 tblSwitch = 0;
for (int height = SCREEN_H; height; height--) {
const uint16 *table = _cgaDitheringTables[(tblSwitch++) & 1];
@@ -787,7 +787,7 @@ const uint8 *Screen_EoB::scaleShapeStep(const uint8 *shp) {
uint8 *dst = (shp != _dsTempPage) ? _dsTempPage : _dsTempPage + 6000;
uint8 *d = dst;
uint8 pixelsPerByte = *d++ = *shp++;
- assert (pixelsPerByte > 1);
+ assert(pixelsPerByte > 1);
uint16 h = shp[0] + 1;
d[0] = d[2] = (h << 1) / 3;
@@ -841,7 +841,7 @@ const uint8 *Screen_EoB::scaleShapeStep(const uint8 *shp) {
shp += w2;
}
- return (const uint8*)dst;
+ return (const uint8 *)dst;
}
const uint8 *Screen_EoB::generateShapeOverlay(const uint8 *shp, int paletteOverlayIndex) {
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 9de6a58..934483d 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -62,7 +62,7 @@ public:
const uint8 *generateShapeOverlay(const uint8 *shp, int paletteOverlayIndex);
void setShapeFrame(int x1, int y1, int x2, int y2);
- void setShapeFadeMode (uint8 i, bool b);
+ void setShapeFadeMode(uint8 i, bool b);
void setGfxParameters(int x, int y, int col);
void drawExplosion(int scale, int radius, int numElements, int stepSize, int aspectRatio, const uint8 *colorTable, int colorTableSize);
@@ -119,7 +119,7 @@ private:
static const int _screenDimTableCount;
};
-} // End of namespace Kyra
+} // End of namespace Kyra
#endif // ENABLE_EOB
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index fc8b4cf..ff3a5e0 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -91,7 +91,7 @@ private:
EoBCoreEngine *_vm;
Screen_EoB *_screen;
- typedef Common::Functor1Mem<int8*, int, EoBInfProcessor> InfProc;
+ typedef Common::Functor1Mem<int8 *, int, EoBInfProcessor> InfProc;
struct InfOpcode : private Common::NonCopyable {
InfOpcode(InfProc *p, const char *d) : proc(p), desc(d) {}
~InfOpcode() { delete proc; }
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 4a9f7d8..d28da4d 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -706,7 +706,7 @@ void EoBIntroPlayer::waterdeepExit() {
_vm->delay(60 * _vm->_tickLength);
for (int i = 0; i < 56 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
- uint32 end = _vm->_system->getMillis() +_vm->_tickLength;
+ uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
_screen->copyRegion(0, 136 + i, 80, 16, 160, 56 - i, 2, 0, Screen::CR_NO_P_CHECK);
_screen->copyRegion(160, 0, 80, 72 - i, 160, 96 + i, 2, 0, Screen::CR_NO_P_CHECK);
_screen->updateScreen();
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 7a5012f..0e34341 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1187,7 +1187,7 @@ void EoBEngine::initSpells() {
const KyraRpgGUISettings EoBEngine::_guiSettingsVGA = {
{ 9, 15, 95, 9, 7, { 285, 139 }, { 189, 162 }, { 31, 31 } },
- { 135, 130, 132, 133, 133, 17, 23, 20, 184, 177, 180, 184, 177, 180 }
+ { 135, 130, 132, 133, 133, 17, 23, 20, 184, 177, 180, 184, 177, 180 }
};
const KyraRpgGUISettings EoBEngine::_guiSettingsEGA = {
@@ -1210,7 +1210,7 @@ void DarkMoonEngine::initStaticResource() {
_animIntro[i] = _staticres->loadEoB2SeqData(kEob2IntroAnimData00 + i, temp);
_shapesIntro = new const DarkMoonShapeDef*[13];
- memset(_shapesIntro, 0, sizeof(DarkMoonShapeDef*) * 13);
+ memset(_shapesIntro, 0, sizeof(DarkMoonShapeDef *) * 13);
_shapesIntro[0] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes00, temp);
_shapesIntro[1] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes01, temp);
_shapesIntro[4] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes04, temp);
@@ -1225,7 +1225,7 @@ void DarkMoonEngine::initStaticResource() {
_animFinale[i] = _staticres->loadEoB2SeqData(kEob2FinaleAnimData00 + i, temp);
_shapesFinale = new const DarkMoonShapeDef*[13];
- memset(_shapesFinale, 0, sizeof(DarkMoonShapeDef*) * 13);
+ memset(_shapesFinale, 0, sizeof(DarkMoonShapeDef *) * 13);
_shapesFinale[0] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes00, temp);
_shapesFinale[3] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes03, temp);
_shapesFinale[7] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes07, temp);
Commit: 6437aa2c92ffc60290d9983be337d6e6482b4ec8
https://github.com/scummvm/scummvm/commit/6437aa2c92ffc60290d9983be337d6e6482b4ec8
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-11-19T03:54:42-08:00
Commit Message:
KYRA: Strip trailing whitespaces.
Changed paths:
engines/kyra/staticres_lol.cpp
diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp
index b8a68ff..c23aed3 100644
--- a/engines/kyra/staticres_lol.cpp
+++ b/engines/kyra/staticres_lol.cpp
@@ -222,7 +222,7 @@ void LoLEngine::initStaticResource() {
} else if (_flags.platform == Common::kPlatformPC98) {
static const char *const fileListIntro[] = { 0, "lore84.86", "lore82.86", 0, 0, 0, "lore83.86", "lore81.86" };
static const char *const fileListFinale[] = { 0, 0, "lore85.86", "lore86.86", "lore87.86" };
- SoundResourceInfo_TownsPC98V2 resInfoIntro(fileListIntro, ARRAYSIZE(fileListIntro), 0, 0, 0);
+ SoundResourceInfo_TownsPC98V2 resInfoIntro(fileListIntro, ARRAYSIZE(fileListIntro), 0, 0, 0);
SoundResourceInfo_TownsPC98V2 resInfoIngame(0, 0, "lore%02d.86", 0, 0);
SoundResourceInfo_TownsPC98V2 resInfoFinale(fileListFinale, ARRAYSIZE(fileListFinale), 0, 0, 0);
_sound->initAudioResourceInfo(kMusicIntro, &resInfoIntro);
Commit: dd551c4775ab016ad9d24e2d48a0919bf5739d4b
https://github.com/scummvm/scummvm/commit/dd551c4775ab016ad9d24e2d48a0919bf5739d4b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-11-19T04:00:33-08:00
Commit Message:
KYRA: Make more static data tables const.
Changed paths:
engines/kyra/chargen.cpp
engines/kyra/darkmoon.h
engines/kyra/scene_eob.cpp
engines/kyra/sequences_hof.cpp
engines/kyra/staticres_eob.cpp
diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 2327434..7ea2feb 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1206,7 +1206,7 @@ void CharacterGenerator::finish() {
static const int8 itemList1[] = { 1, 2, 0, 17, -1, 0, 0 };
static const int8 itemList2[] = { 2, 56, 1, 17, 31, 0, 1, 23, 1, 17, 31, 0, 1 };
static const int8 itemList3[] = { 2, 1, 1, 17, 31, 1, 1, 1, 0, 17, 31, 2, 1 };
- static const int8 *itemList[] = { itemList0, itemList1, itemList2, itemList3 };
+ static const int8 *const itemList[] = { itemList0, itemList1, itemList2, itemList3 };
for (int i = 0; i < 4; i++) {
EoBCharacter *c = &_characters[i];
diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h
index a61990a..5f09049 100644
--- a/engines/kyra/darkmoon.h
+++ b/engines/kyra/darkmoon.h
@@ -83,10 +83,10 @@ private:
const DarkMoonAnimCommand **_animFinale;
const DarkMoonShapeDef **_shapesFinale;
- static const char *_palFilesIntroVGA[];
- static const char *_palFilesIntroEGA[];
- static const char *_palFilesFinaleVGA[];
- static const char *_palFilesFinaleEGA[];
+ static const char *const _palFilesIntroVGA[];
+ static const char *const _palFilesIntroEGA[];
+ static const char *const _palFilesFinaleVGA[];
+ static const char *const _palFilesFinaleEGA[];
// Ingame sequence
void seq_nightmare();
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index bf9eb01..53f000a 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -100,7 +100,7 @@ void EoBCoreEngine::loadLevel(int level, int sub) {
void EoBCoreEngine::readLevelFileData(int level) {
Common::String file;
Common::SeekableReadStream *s = 0;
- static const char *suffix[] = { "INF", "DRO", "ELO", 0 };
+ static const char *const suffix[] = { "INF", "DRO", "ELO", 0 };
for (const char *const *sf = suffix; *sf && !s; sf++) {
file = Common::String::format("LEVEL%d.%s", level, *sf);
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 757907d..110cfec 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -572,8 +572,8 @@ void SeqPlayer_HOF::setupCallbacks() {
#endif
static const SeqProc nestedSeqCallbacksLoLDemo[] = { 0 };
- static const SeqProc *seqCallbacks[] = { seqCallbacksHoF, seqCallbacksHoFDemo, seqCallbacksLoLDemo};
- static const SeqProc *nestedSeqCallbacks[] = { nestedSeqCallbacksHoF, nestedSeqCallbacksHoFDemo, nestedSeqCallbacksLoLDemo};
+ static const SeqProc *const seqCallbacks[] = { seqCallbacksHoF, seqCallbacksHoFDemo, seqCallbacksLoLDemo};
+ static const SeqProc *const nestedSeqCallbacks[] = { nestedSeqCallbacksHoF, nestedSeqCallbacksHoFDemo, nestedSeqCallbacksLoLDemo};
int tmpSize = 0;
delete _config;
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 0e34341..79f018c 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -465,13 +465,13 @@ void EoBCoreEngine::initStaticResource() {
// EOB I doesn't have load and save menus, because there is only one single
// save slot. Instead of emulating this we provide a menu similiar to EOB II.
- static const char *saveLoadStrings[3][4] = {
+ static const char *const saveLoadStrings[3][4] = {
{ "Cancel", "Empty Slot", "Save Game", "Load Game" },
{ "Abbr.", "Leerer Slot", "Speichern", " Laden" },
{ 0, 0, 0, 0 }
};
- static const char *errorSlotEmptyString[3] = {
+ static const char *const errorSlotEmptyString[3] = {
"There is no game\rsaved in that slot!",
"Hier ist noch kein\rSpiel gespeichert!",
0
@@ -1096,7 +1096,7 @@ void EoBEngine::initStaticResource() {
p->dmgModifierEvade = *ps++;
}
- static const char *errorSlotNoNameString[3] = {
+ static const char *const errorSlotNoNameString[3] = {
" You must specify\r a name for your\r save game!",
" Spielstaende mues-\r sen einen Namen\r haben!",
0
@@ -1249,7 +1249,7 @@ void DarkMoonEngine::initStaticResource() {
_wallOfForceDsNumH = _staticres->loadRawData(kEoB2WallOfForceNumH, temp);
_wallOfForceShpId = _staticres->loadRawData(kEoB2WallOfForceShpId, temp);
- static const char *errorSlotNoNameString[3] = {
+ static const char *const errorSlotNoNameString[3] = {
" You must specify\r a name for your\r save game!",
" Spielst[nde m]ssen\r einen Namen haben!",
0
@@ -1258,7 +1258,7 @@ void DarkMoonEngine::initStaticResource() {
_errorSlotNoNameString = errorSlotNoNameString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
// ScummVM specific
- static const char *transferStringsScummVM[3][5] = {
+ static const char *const transferStringsScummVM[3][5] = {
{
"\r We cannot find any EOB save game\r file. Please make sure that the\r save game file with the party\r you wish to transfer is located\r in your ScummVM save game\r directory. If you have set up\r multiple save directories you\r have to copy the EOB save file\r into your EOB II save directory.\r Do you wish to try again?",
"Game ID",
@@ -1300,7 +1300,7 @@ void DarkMoonEngine::initSpells() {
}
}
-const char *DarkMoonEngine::_palFilesIntroVGA[] = {
+const char *const DarkMoonEngine::_palFilesIntroVGA[] = {
"PALETTE1.PAL",
"PALETTE3.PAL",
"PALETTE2.PAL",
@@ -1308,7 +1308,7 @@ const char *DarkMoonEngine::_palFilesIntroVGA[] = {
0
};
-const char *DarkMoonEngine::_palFilesIntroEGA[] = {
+const char *const DarkMoonEngine::_palFilesIntroEGA[] = {
"PALETTE0.PAL",
"PALETTE3.PAL",
"PALETTE2.PAL",
@@ -1316,7 +1316,7 @@ const char *DarkMoonEngine::_palFilesIntroEGA[] = {
0
};
-const char *DarkMoonEngine::_palFilesFinaleVGA[] = {
+const char *const DarkMoonEngine::_palFilesFinaleVGA[] = {
"FINALE_0.PAL",
"FINALE_0.PAL",
"FINALE_1.PAL",
@@ -1329,7 +1329,7 @@ const char *DarkMoonEngine::_palFilesFinaleVGA[] = {
0
};
-const char *DarkMoonEngine::_palFilesFinaleEGA[] = {
+const char *const DarkMoonEngine::_palFilesFinaleEGA[] = {
"FINALE_0.PAL",
"FINALE_0.PAL",
"FINALE_1.PAL",
Commit: bbb83f132b23b6a45eb6d979172264c1587f227a
https://github.com/scummvm/scummvm/commit/bbb83f132b23b6a45eb6d979172264c1587f227a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-11-19T04:06:09-08:00
Commit Message:
KYRA: Make "const type *const" use consistent.
I used this command for changing "const type * const" to "const type *const":
git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/const \([a-zA-Z0-9_]*\) \* const/const \1 \*const/g'
Changed paths:
engines/kyra/darkmoon.h
engines/kyra/eobcommon.h
engines/kyra/kyra_hof.h
engines/kyra/kyra_lok.h
engines/kyra/kyra_mr.cpp
engines/kyra/kyra_mr.h
engines/kyra/lol.h
engines/kyra/resource.h
engines/kyra/resource_intern.h
engines/kyra/screen.h
engines/kyra/sequences_hof.cpp
engines/kyra/sound_amiga.cpp
engines/kyra/staticres.cpp
diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h
index 5f09049..f0057dd 100644
--- a/engines/kyra/darkmoon.h
+++ b/engines/kyra/darkmoon.h
@@ -72,14 +72,14 @@ private:
void seq_playFinale();
void seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *data, int sd, int backupPage, int tempPage, int speed);
- const char * const *_introStrings;
- const char * const *_cpsFilesIntro;
+ const char *const *_introStrings;
+ const char *const *_cpsFilesIntro;
const DarkMoonAnimCommand **_animIntro;
const DarkMoonShapeDef **_shapesIntro;
- const char * const *_finaleStrings;
+ const char *const *_finaleStrings;
const uint8 *_creditsData;
- const char * const *_cpsFilesFinale;
+ const char *const *_cpsFilesFinale;
const DarkMoonAnimCommand **_animFinale;
const DarkMoonShapeDef **_shapesFinale;
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index aca3a96..e42130c 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -858,11 +858,11 @@ protected:
void restoreWallOfForceTempData(LevelTempData *tmp);
void releaseWallOfForceTempData(LevelTempData *tmp);
- const char * const *_saveLoadStrings;
+ const char *const *_saveLoadStrings;
const uint8 *_mnDef;
- const char * const *_mnWord;
- const char * const *_mnPrompt;
+ const char *const *_mnWord;
+ const char *const *_mnPrompt;
int _mnNumWord;
int _rrCount;
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index a9831d0..1b84e5b 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -618,16 +618,16 @@ protected:
/* ActiveWSA *_activeWSA;
ActiveText *_activeText;
*/
- /*const char * const *_sequencePakList;
+ /*const char *const *_sequencePakList;
int _sequencePakListSize;*/
- const char * const *_ingamePakList;
+ const char *const *_ingamePakList;
int _ingamePakListSize;
- const char * const *_musicFileListIntro;
+ const char *const *_musicFileListIntro;
int _musicFileListIntroSize;
- const char * const *_musicFileListFinale;
+ const char *const *_musicFileListFinale;
int _musicFileListFinaleSize;
- const char * const *_musicFileListIngame;
+ const char *const *_musicFileListIngame;
int _musicFileListIngameSize;
const uint8 *_cdaTrackTableIntro;
int _cdaTrackTableIntroSize;
@@ -635,13 +635,13 @@ protected:
int _cdaTrackTableIngameSize;
const uint8 *_cdaTrackTableFinale;
int _cdaTrackTableFinaleSize;
- const char * const *_ingameSoundList;
+ const char *const *_ingameSoundList;
int _ingameSoundListSize;
const uint16 *_ingameSoundIndex;
int _ingameSoundIndexSize;
const uint16 *_ingameTalkObjIndex;
int _ingameTalkObjIndexSize;
- const char * const *_ingameTimJpStr;
+ const char *const *_ingameTimJpStr;
int _ingameTimJpStrSize;
const ItemAnimDefinition *_itemAnimDefinition;
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index 7470dd8..def5cbc 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -126,13 +126,13 @@ public:
typedef bool (KyraEngine_LoK::*IntroProc)();
// static data access
- const char * const *seqWSATable() { return _seq_WSATable; }
- const char * const *seqCPSTable() { return _seq_CPSTable; }
- const char * const *seqCOLTable() { return _seq_COLTable; }
- const char * const *seqTextsTable() { return _seq_textsTable; }
+ const char *const *seqWSATable() { return _seq_WSATable; }
+ const char *const *seqCPSTable() { return _seq_CPSTable; }
+ const char *const *seqCOLTable() { return _seq_COLTable; }
+ const char *const *seqTextsTable() { return _seq_textsTable; }
- const uint8 * const *palTable1() { return &_specialPalettes[0]; }
- const uint8 * const *palTable2() { return &_specialPalettes[29]; }
+ const uint8 *const *palTable1() { return &_specialPalettes[0]; }
+ const uint8 *const *palTable2() { return &_specialPalettes[29]; }
protected:
virtual Common::Error go();
@@ -538,12 +538,12 @@ protected:
const uint8 *_seq_Demo4;
const uint8 *_seq_Reunion;
- const char * const *_seq_WSATable;
- const char * const *_seq_CPSTable;
- const char * const *_seq_COLTable;
- const char * const *_seq_textsTable;
+ const char *const *_seq_WSATable;
+ const char *const *_seq_CPSTable;
+ const char *const *_seq_COLTable;
+ const char *const *_seq_textsTable;
- const char * const *_storyStrings;
+ const char *const *_storyStrings;
int _seq_WSATable_Size;
int _seq_CPSTable_Size;
@@ -552,25 +552,25 @@ protected:
int _storyStringsSize;
- const char * const *_itemList;
- const char * const *_takenList;
- const char * const *_placedList;
- const char * const *_droppedList;
- const char * const *_noDropList;
- const char * const *_putDownFirst;
- const char * const *_waitForAmulet;
- const char * const *_blackJewel;
- const char * const *_poisonGone;
- const char * const *_healingTip;
- const char * const *_thePoison;
- const char * const *_fluteString;
- const char * const *_wispJewelStrings;
- const char * const *_magicJewelString;
- const char * const *_flaskFull;
- const char * const *_fullFlask;
- const char * const *_veryClever;
- const char * const *_homeString;
- const char * const *_newGameString;
+ const char *const *_itemList;
+ const char *const *_takenList;
+ const char *const *_placedList;
+ const char *const *_droppedList;
+ const char *const *_noDropList;
+ const char *const *_putDownFirst;
+ const char *const *_waitForAmulet;
+ const char *const *_blackJewel;
+ const char *const *_poisonGone;
+ const char *const *_healingTip;
+ const char *const *_thePoison;
+ const char *const *_fluteString;
+ const char *const *_wispJewelStrings;
+ const char *const *_magicJewelString;
+ const char *const *_flaskFull;
+ const char *const *_fullFlask;
+ const char *const *_veryClever;
+ const char *const *_homeString;
+ const char *const *_newGameString;
int _itemList_Size;
int _takenList_Size;
@@ -592,13 +592,13 @@ protected:
int _homeString_Size;
int _newGameString_Size;
- const char * const *_characterImageTable;
+ const char *const *_characterImageTable;
int _characterImageTableSize;
- const char * const *_guiStrings;
+ const char *const *_guiStrings;
int _guiStringsSize;
- const char * const *_configStrings;
+ const char *const *_configStrings;
int _configStringsSize;
Shape *_defaultShapeTable;
@@ -636,12 +636,12 @@ protected:
Room *_roomTable;
int _roomTableSize;
- const char * const *_roomFilenameTable;
+ const char *const *_roomFilenameTable;
int _roomFilenameTableSize;
const uint8 *_amuleteAnim;
- const uint8 * const *_specialPalettes;
+ const uint8 *const *_specialPalettes;
// positions of the inventory
static const uint16 _itemPosX[];
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 448e4ef..baf8881 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -724,7 +724,7 @@ void KyraEngine_MR::loadCharacterShapes(int newShapes) {
static const uint8 numberOffset[] = { 3, 3, 4, 4, 3, 3 };
static const uint8 startShape[] = { 0x32, 0x58, 0x78, 0x98, 0xB8, 0xD8 };
static const uint8 endShape[] = { 0x57, 0x77, 0x97, 0xB7, 0xD7, 0xF7 };
- static const char * const filenames[] = {
+ static const char *const filenames[] = {
"MSW##.SHP",
"MTA##.SHP",
"MTFL##.SHP",
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 004236c..d194fed 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -182,11 +182,11 @@ private:
private:
// main menu
- const char * const *_mainMenuStrings;
+ const char *const *_mainMenuStrings;
int _mainMenuStringsSize;
- static const char * const _mainMenuSpanishFan[];
- static const char * const _mainMenuItalianFan[];
+ static const char *const _mainMenuSpanishFan[];
+ static const char *const _mainMenuItalianFan[];
// animator
uint8 *_gamePlayBuffer;
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index be2d833..d8df6b6 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -391,7 +391,7 @@ private:
uint8 _outroShapeTable[256];
// TODO: Consider moving these tables to kyra.dat
- static const char * const _outroShapeFileTable[];
+ static const char *const _outroShapeFileTable[];
static const uint8 _outroFrameTable[];
static const int16 _outroRightMonsterPos[];
@@ -814,7 +814,7 @@ private:
void decodeSjis(const char *src, char *dst);
int decodeCyrillic(const char *src, char *dst);
- static const char * const _languageExt[];
+ static const char *const _languageExt[];
// graphics
void setupScreenDims();
@@ -1013,8 +1013,8 @@ private:
uint8 *_tempBuffer5120;
- const char * const *_levelDatList;
- const char * const *_levelShpList;
+ const char *const *_levelDatList;
+ const char *const *_levelShpList;
const int8 *_dscWalls;
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 74ac1b6..5364cce 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -62,7 +62,7 @@ public:
bool isInCacheList(Common::String name);
bool loadFileList(const Common::String &filedata);
- bool loadFileList(const char * const *filelist, uint32 numFiles);
+ bool loadFileList(const char *const *filelist, uint32 numFiles);
// This unloads *all* pakfiles, even kyra.dat and protected ones.
// It does not remove files from cache though!
@@ -87,7 +87,7 @@ protected:
Common::Archive *loadArchive(const Common::String &name, Common::ArchiveMemberPtr member);
Common::Archive *loadInstallerArchive(const Common::String &file, const Common::String &ext, const uint8 offset);
- bool loadProtectedFiles(const char * const * list);
+ bool loadProtectedFiles(const char *const * list);
void initializeLoaders();
@@ -757,7 +757,7 @@ public:
bool init();
void deinit();
- const char * const *loadStrings(int id, int &strings);
+ const char *const *loadStrings(int id, int &strings);
const uint8 *loadRawData(int id, int &size);
const Shape *loadShapeTable(int id, int &entries);
const AmigaSfxTable *loadAmigaSfxTable(int id, int &entries);
diff --git a/engines/kyra/resource_intern.h b/engines/kyra/resource_intern.h
index 9d9574d..e63eab7 100644
--- a/engines/kyra/resource_intern.h
+++ b/engines/kyra/resource_intern.h
@@ -75,7 +75,7 @@ private:
const uint32 *findFile(const Common::String &name) const;
const uint16 _entryCount;
- const uint32 * const _fileEntries;
+ const uint32 *const _fileEntries;
};
class CachedArchive : public Common::Archive {
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index bd94e26..7f3abf8 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -596,7 +596,7 @@ protected:
int _animBlockSize;
// dimension handling
- const ScreenDim * const _dimTable;
+ const ScreenDim *const _dimTable;
ScreenDim **_customDimTable;
const int _dimTableCount;
int _curDimIndex;
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 110cfec..207d0ce 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -216,8 +216,8 @@ private:
uint8 _textColorMap[16];
int _textDuration[33];
- const char * const *_sequenceStrings;
- const char * const *_sequenceSoundList;
+ const char *const *_sequenceStrings;
+ const char *const *_sequenceSoundList;
int _sequenceSoundListSize;
static const uint8 _textColorPresets[];
@@ -1476,7 +1476,7 @@ void SeqPlayer_HOF::playHoFTalkieCredits() {
int talkieCreditsSize, talkieCreditsSpecialSize;
const uint8 *talkieCredits = _vm->staticres()->loadRawData(k2SeqplayCredits, talkieCreditsSize);
- const char * const *talkieCreditsSpecial = _vm->staticres()->loadStrings(k2SeqplayCreditsSpecial, talkieCreditsSpecialSize);
+ const char *const *talkieCreditsSpecial = _vm->staticres()->loadStrings(k2SeqplayCreditsSpecial, talkieCreditsSpecialSize);
_vm->sound()->selectAudioResourceSet(kMusicIngame);
_vm->sound()->loadSoundFile(3);
diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp
index 5962d6f..f633a42 100644
--- a/engines/kyra/sound_amiga.cpp
+++ b/engines/kyra/sound_amiga.cpp
@@ -72,7 +72,7 @@ bool SoundAmiga::hasSoundFile(uint file) {
void SoundAmiga::loadSoundFile(uint file) {
debugC(5, kDebugLevelSound, "SoundAmiga::loadSoundFile(%d)", file);
- static const char * const tableFilenames[3][2] = {
+ static const char *const tableFilenames[3][2] = {
{ "introscr.mx", "introinst.mx" },
{ "kyramusic.mx", 0 },
{ "finalescr.mx", "introinst.mx" }
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index a488884..372e903 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -290,7 +290,7 @@ void StaticResource::deinit() {
}
const char *const *StaticResource::loadStrings(int id, int &strings) {
- return (const char * const *)getData(id, kStringList, strings);
+ return (const char *const *)getData(id, kStringList, strings);
}
const uint8 *StaticResource::loadRawData(int id, int &size) {
More information about the Scummvm-git-logs
mailing list