diff options
author | Le Philousophe | 2019-06-23 08:58:31 +0200 |
---|---|---|
committer | Le Philousophe | 2019-07-05 07:40:29 +0200 |
commit | 57b74a2773ae083121e0e621eb555c19d666ea2a (patch) | |
tree | bae1302fff544b98167766ed7e3b359a30107760 /engines/cryomni3d | |
parent | c24304a78b8f04b36be28877e29135341a2953e4 (diff) | |
download | scummvm-rg350-57b74a2773ae083121e0e621eb555c19d666ea2a.tar.gz scummvm-rg350-57b74a2773ae083121e0e621eb555c19d666ea2a.tar.bz2 scummvm-rg350-57b74a2773ae083121e0e621eb555c19d666ea2a.zip |
CRYOMNI3D: Load all characters and not only the letters
That will be useful for i18n. Let's suppose all the versions have all
the characters.
Diffstat (limited to 'engines/cryomni3d')
-rw-r--r-- | engines/cryomni3d/versailles/engine.h | 4 | ||||
-rw-r--r-- | engines/cryomni3d/versailles/logic.cpp | 30 |
2 files changed, 21 insertions, 13 deletions
diff --git a/engines/cryomni3d/versailles/engine.h b/engines/cryomni3d/versailles/engine.h index 83beddbd4b..ff00dfd385 100644 --- a/engines/cryomni3d/versailles/engine.h +++ b/engines/cryomni3d/versailles/engine.h @@ -513,7 +513,7 @@ private: static const char *kEpigraphPassword; bool handleEpigraph(ZonFixedImage *fimg); void drawEpigraphLetters(Graphics::ManagedSurface &surface, - const Graphics::Surface(&bmpLetters)[26], const Common::String &letters); + const Graphics::Surface(&bmpLetters)[28], const Common::String &letters); IMG_CB(45130); IMG_CB(45270); IMG_CB(45270b); @@ -536,7 +536,7 @@ private: static const uint16 kBombLettersPos[2][kBombPasswordMaxLength][2]; static const char *kBombPassword; bool handleBomb(ZonFixedImage *fimg); - void drawBombLetters(Graphics::ManagedSurface &surface, const Graphics::Surface(&bmpLetters)[26], + void drawBombLetters(Graphics::ManagedSurface &surface, const Graphics::Surface(&bmpLetters)[28], const uint kBombPasswordLength, const unsigned char (&bombPossibilites)[kBombPasswordMaxLength][5], const unsigned char (&bombCurrentLetters)[kBombPasswordMaxLength]); diff --git a/engines/cryomni3d/versailles/logic.cpp b/engines/cryomni3d/versailles/logic.cpp index 0911a16136..e46c1a7ca0 100644 --- a/engines/cryomni3d/versailles/logic.cpp +++ b/engines/cryomni3d/versailles/logic.cpp @@ -184,12 +184,12 @@ void CryOmni3DEngine_Versailles::obj_126() { } void CryOmni3DEngine_Versailles::obj_126hk(Graphics::ManagedSurface &surface) { - Graphics::Surface bmpLetters[26]; - loadBMPs("bomb_%02d.bmp", bmpLetters, 26); + Graphics::Surface bmpLetters[28]; + loadBMPs("bomb_%02d.bmp", bmpLetters, 28); drawEpigraphLetters(surface, bmpLetters, kEpigraphPassword); - for (uint i = 0; i < 26; i++) { + for (uint i = 0; i < 28; i++) { bmpLetters[i].free(); } } @@ -2340,11 +2340,11 @@ IMG_CB(44161f) { bool CryOmni3DEngine_Versailles::handleEpigraph(ZonFixedImage *fimg) { bool success = false; - Graphics::Surface bmpLetters[26]; + Graphics::Surface bmpLetters[28]; Common::String password; Graphics::ManagedSurface tempSurf; - loadBMPs("bomb_%02d.bmp", bmpLetters, 26); + loadBMPs("bomb_%02d.bmp", bmpLetters, 28); fimg->load("EPIL.GIF"); const Graphics::Surface *fimgSurface = fimg->surface(); @@ -2397,7 +2397,7 @@ bool CryOmni3DEngine_Versailles::handleEpigraph(ZonFixedImage *fimg) { } } - for (uint i = 0; i < 26; i++) { + for (uint i = 0; i < 28; i++) { bmpLetters[i].free(); } return success; @@ -2407,11 +2407,15 @@ const char *CryOmni3DEngine_Versailles::kEpigraphContent = "FELIXFORTUNADIVINUME const char *CryOmni3DEngine_Versailles::kEpigraphPassword = "LELOUPETLATETE"; void CryOmni3DEngine_Versailles::drawEpigraphLetters(Graphics::ManagedSurface &surface, - const Graphics::Surface(&bmpLetters)[26], const Common::String &letters) { + const Graphics::Surface(&bmpLetters)[28], const Common::String &letters) { for (uint i = 0; i < letters.size() && i < kEpigraphMaxLetters; i++) { uint letterId = 0; if (letters[i] >= 'A' && letters[i] <= 'Z') { letterId = letters[i] - 'A'; + } else if (letters[i] == ' ') { + letterId = 26; + } else if (letters[i] == '\'') { + letterId = 27; } const Graphics::Surface &letter = bmpLetters[letterId]; Common::Point dst(34 * i + 4, 380); @@ -2925,7 +2929,7 @@ IMG_CB(88003f) { bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) { bool success = false; Common::RandomSource rnd("VersaillesBomb"); - Graphics::Surface bmpLetters[26]; + Graphics::Surface bmpLetters[28]; unsigned char bombPossibilites[60][5]; unsigned char bombCurrentLetters[60]; Graphics::ManagedSurface tempSurf; @@ -2935,7 +2939,7 @@ bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) { error("Bomb password is too long"); } - loadBMPs("bomb_%02d.bmp", bmpLetters, 26); + loadBMPs("bomb_%02d.bmp", bmpLetters, 28); for (uint i = 0; i < kBombPasswordLength; i++) { bombPossibilites[i][0] = toupper(kBombPassword[i]); for (uint j = 1; j < 5; j++) { @@ -3003,7 +3007,7 @@ bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) { } } - for (uint i = 0; i < 26; i++) { + for (uint i = 0; i < 28; i++) { bmpLetters[i].free(); } return success; @@ -3118,7 +3122,7 @@ const uint16 CryOmni3DEngine_Versailles::kBombLettersPos[2][kBombPasswordMaxLeng }; void CryOmni3DEngine_Versailles::drawBombLetters(Graphics::ManagedSurface &surface, - const Graphics::Surface(&bmpLetters)[26], const uint kBombPasswordLength, + const Graphics::Surface(&bmpLetters)[28], const uint kBombPasswordLength, const unsigned char (&bombPossibilites)[kBombPasswordMaxLength][5], const unsigned char (&bombCurrentLetters)[kBombPasswordMaxLength]) { uint table = kBombPasswordLength <= kBombPasswordSmallLength ? 0 : 1; @@ -3127,6 +3131,10 @@ void CryOmni3DEngine_Versailles::drawBombLetters(Graphics::ManagedSurface &surfa uint letterId = 0; if (letterChar >= 'A' && letterChar <= 'Z') { letterId = letterChar - 'A'; + } else if (letterChar == ' ') { + letterId = 26; + } else if (letterChar == '\'') { + letterId = 27; } const Graphics::Surface &letter = bmpLetters[letterId]; Common::Point dst(kBombLettersPos[table][i][0], kBombLettersPos[table][i][1]); |