diff options
author | Le Philousophe | 2019-05-30 16:06:45 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2019-06-01 22:43:48 +0200 |
commit | e07844e06b56c3d299c5c7f88c5910dd0c882f3c (patch) | |
tree | c264c2fae2597536ac6d8c2f2f1b83f661105360 /engines/cryomni3d | |
parent | f20d33f1305ace5f7cc9c7cf9c2a299c35bc0c77 (diff) | |
download | scummvm-rg350-e07844e06b56c3d299c5c7f88c5910dd0c882f3c.tar.gz scummvm-rg350-e07844e06b56c3d299c5c7f88c5910dd0c882f3c.tar.bz2 scummvm-rg350-e07844e06b56c3d299c5c7f88c5910dd0c882f3c.zip |
CRYOMNI3D: Fix constants names
Diffstat (limited to 'engines/cryomni3d')
-rw-r--r-- | engines/cryomni3d/versailles/data.cpp | 6 | ||||
-rw-r--r-- | engines/cryomni3d/versailles/logic.cpp | 46 |
2 files changed, 26 insertions, 26 deletions
diff --git a/engines/cryomni3d/versailles/data.cpp b/engines/cryomni3d/versailles/data.cpp index 61ed9e4f75..cbfe190cbb 100644 --- a/engines/cryomni3d/versailles/data.cpp +++ b/engines/cryomni3d/versailles/data.cpp @@ -301,7 +301,7 @@ struct VideoSubSetting { int16 drawBottom; }; -static const VideoSubSetting videoSubSettings[] = { +static const VideoSubSetting kVideoSubSettings[] = { {"11D_LEB", 15, 11, 190, 479, 208, 129, 562, 479}, {"11E_HUI", 330, 9, 620, 479, 111, 109, 321, 341}, {"11E_MAN", 403, 12, 630, 479, 134, 89, 390, 405}, @@ -504,8 +504,8 @@ void CryOmni3DEngine_Versailles::setupDialogVariables() { SET_DIAL_VARIABLE(136, "{CURRENT_GAME_TIME5}"); SET_DIAL_VARIABLE(137, "{JOUEUR_POSSEDE_EPIGRAPHE}"); #undef SET_DIAL_VARIABLE - for (uint i = 0; i < ARRAYSIZE(videoSubSettings); i++) { - const VideoSubSetting &vss = videoSubSettings[i]; + for (uint i = 0; i < ARRAYSIZE(kVideoSubSettings); i++) { + const VideoSubSetting &vss = kVideoSubSettings[i]; _dialogsMan.registerSubtitlesSettings( vss.videoName, DialogsManager::SubtitlesSettings( diff --git a/engines/cryomni3d/versailles/logic.cpp b/engines/cryomni3d/versailles/logic.cpp index 2f18f96eb2..d39d531f64 100644 --- a/engines/cryomni3d/versailles/logic.cpp +++ b/engines/cryomni3d/versailles/logic.cpp @@ -33,7 +33,7 @@ namespace CryOmni3D { namespace Versailles { -static const char *imagesObjects[] = { +static const char *kImagesObjects[] = { "PAMP.gif", // 0: 96 "PAPT_2.gif", // 1: 98 "PAML.gif", // 2: 101 @@ -131,56 +131,56 @@ void CryOmni3DEngine_Versailles::setupObjects() { template<uint ID> void CryOmni3DEngine_Versailles::genericDisplayObject() { - displayObject(imagesObjects[ID]); + displayObject(kImagesObjects[ID]); } void CryOmni3DEngine_Versailles::obj_105() { - displayObject(imagesObjects[3]); - displayObject(imagesObjects[4]); - displayObject(imagesObjects[5]); - displayObject(imagesObjects[6]); + displayObject(kImagesObjects[3]); + displayObject(kImagesObjects[4]); + displayObject(kImagesObjects[5]); + displayObject(kImagesObjects[6]); } void CryOmni3DEngine_Versailles::obj_106() { - displayObject(imagesObjects[6]); - displayObject(imagesObjects[3]); - displayObject(imagesObjects[4]); + displayObject(kImagesObjects[6]); + displayObject(kImagesObjects[3]); + displayObject(kImagesObjects[4]); } void CryOmni3DEngine_Versailles::obj_107() { if (_gameVariables[GameVariables::kSketchState] == 3) { - displayObject(imagesObjects[7]); + displayObject(kImagesObjects[7]); } else { - displayObject(imagesObjects[6]); + displayObject(kImagesObjects[6]); } } void CryOmni3DEngine_Versailles::obj_118() { if (_gameVariables[GameVariables::kDecipherScore]) { - displayObject(imagesObjects[11]); + displayObject(kImagesObjects[11]); } else { - displayObject(imagesObjects[10]); + displayObject(kImagesObjects[10]); } } void CryOmni3DEngine_Versailles::obj_121() { if (_gameVariables[GameVariables::kGotMedalsSolution]) { - displayObject(imagesObjects[13]); + displayObject(kImagesObjects[13]); } else { - displayObject(imagesObjects[12]); + displayObject(kImagesObjects[12]); } } void CryOmni3DEngine_Versailles::obj_125() { if (_gameVariables[GameVariables::kStateLampoonReligion]) { - displayObject(imagesObjects[15]); + displayObject(kImagesObjects[15]); } else { - displayObject(imagesObjects[14]); + displayObject(kImagesObjects[14]); } } void CryOmni3DEngine_Versailles::obj_126() { - displayObject(imagesObjects[16], &CryOmni3DEngine_Versailles::obj_126hk); + displayObject(kImagesObjects[16], &CryOmni3DEngine_Versailles::obj_126hk); } void CryOmni3DEngine_Versailles::obj_126hk(Graphics::ManagedSurface &surface) { @@ -197,9 +197,9 @@ void CryOmni3DEngine_Versailles::obj_126hk(Graphics::ManagedSurface &surface) { void CryOmni3DEngine_Versailles::obj_142() { // Display a marker only when in maze if (_currentLevel == 6 && _currentPlaceId >= 14 && _currentPlaceId <= 44) { - displayObject(imagesObjects[26], &CryOmni3DEngine_Versailles::obj_142hk); + displayObject(kImagesObjects[26], &CryOmni3DEngine_Versailles::obj_142hk); } else { - displayObject(imagesObjects[26]); + displayObject(kImagesObjects[26]); } } @@ -260,7 +260,7 @@ void CryOmni3DEngine_Versailles::obj_142hk(Graphics::ManagedSurface &surface) { } // This array contains images for all paintings it must be kept in sync with _paintingsTitles -static const char *imagesPaintings[] = { +static const char *kImagesPaintings[] = { "10E_1.GIF", // 0: 41201 nullptr, // 1: 41202 "10E_3.GIF", // 2: 41203 @@ -426,7 +426,7 @@ void CryOmni3DEngine_Versailles::setupImgScripts() { // Generic handler for dumb fixed images template<uint ID> void CryOmni3DEngine_Versailles::genericDumbImage(ZonFixedImage *fimg) { - fimg->load(imagesPaintings[ID]); + fimg->load(kImagesPaintings[ID]); while (1) { fimg->manage(); if (fimg->_exit || fimg->_zoneLow) { @@ -448,7 +448,7 @@ void CryOmni3DEngine_Versailles::genericDumbImage(ZonFixedImage *fimg) { // Generic handler for paintings fixed images template<uint ID> void CryOmni3DEngine_Versailles::genericPainting(ZonFixedImage *fimg) { - fimg->load(imagesPaintings[ID]); + fimg->load(kImagesPaintings[ID]); while (1) { fimg->manage(); if (fimg->_exit || fimg->_zoneLow) { |