diff options
| author | Le Philousophe | 2019-05-30 12:22:24 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-06-01 22:43:48 +0200 |
| commit | b81f477ac1828862ba8c30cec90679606f64de3c (patch) | |
| tree | 33881ce9da31f32fb61c7a2442104fc9f418f53e /engines/cryomni3d | |
| parent | d5a6c1c9cbf071c6b5a8f23334bdfb87808a4ab3 (diff) | |
| download | scummvm-rg350-b81f477ac1828862ba8c30cec90679606f64de3c.tar.gz scummvm-rg350-b81f477ac1828862ba8c30cec90679606f64de3c.tar.bz2 scummvm-rg350-b81f477ac1828862ba8c30cec90679606f64de3c.zip | |
CRYOMNI3D: Convert short to int16
Diffstat (limited to 'engines/cryomni3d')
| -rw-r--r-- | engines/cryomni3d/versailles/engine.h | 6 | ||||
| -rw-r--r-- | engines/cryomni3d/versailles/logic.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/cryomni3d/versailles/engine.h b/engines/cryomni3d/versailles/engine.h index 1d92d38fcd..66f4663a86 100644 --- a/engines/cryomni3d/versailles/engine.h +++ b/engines/cryomni3d/versailles/engine.h @@ -461,8 +461,8 @@ private: IMG_CB(34174e); IMG_CB(34174f); static const uint kSafeDigitsCount = 12; - static const unsigned short kSafeDigitsX[]; - static const unsigned short kSafeDigitsY[]; + static const uint16 kSafeDigitsX[]; + static const uint16 kSafeDigitsY[]; static const char *kSafeDates[]; bool handleSafe(ZonFixedImage *fimg); void drawSafeDigits(Graphics::ManagedSurface &surface, const Graphics::Surface(&bmpDigits)[10], @@ -529,7 +529,7 @@ private: IMG_CB(88003f); static const uint kBombPasswordSmallLength = 40; static const uint kBombPasswordMaxLength = 60; - static const unsigned short kBombLettersPos[2][kBombPasswordMaxLength][2]; + 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], diff --git a/engines/cryomni3d/versailles/logic.cpp b/engines/cryomni3d/versailles/logic.cpp index 5d0eea2172..2f18f96eb2 100644 --- a/engines/cryomni3d/versailles/logic.cpp +++ b/engines/cryomni3d/versailles/logic.cpp @@ -1242,8 +1242,8 @@ bool CryOmni3DEngine_Versailles::handleSafe(ZonFixedImage *fimg) { return success; } -const unsigned short CryOmni3DEngine_Versailles::kSafeDigitsX[] = { 267, 318, 370, 421 }; -const unsigned short CryOmni3DEngine_Versailles::kSafeDigitsY[] = { 148, 230, 311 }; +const uint16 CryOmni3DEngine_Versailles::kSafeDigitsX[] = { 267, 318, 370, 421 }; +const uint16 CryOmni3DEngine_Versailles::kSafeDigitsY[] = { 148, 230, 311 }; void CryOmni3DEngine_Versailles::drawSafeDigits(Graphics::ManagedSurface &surface, const Graphics::Surface(&bmpDigits)[10], const unsigned char (&safeDigits)[kSafeDigitsCount]) { @@ -3011,7 +3011,7 @@ bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) { const char *CryOmni3DEngine_Versailles::kBombPassword = "JEMENVAISMAISLETATDEMEURERATOUJOURS"; // We use brace elision here because it's dumped from the EXE -const unsigned short CryOmni3DEngine_Versailles::kBombLettersPos[2][kBombPasswordMaxLength][2] = { +const uint16 CryOmni3DEngine_Versailles::kBombLettersPos[2][kBombPasswordMaxLength][2] = { { 26, 91, 84, 89, 141, 89, 202, 88, 261, 87, 322, 86, 384, 85, 448, 84, 512, 83, 576, 83, 26, 175, 84, 175, 142, 174, 202, 174, 260, 174, 322, |