diff options
author | Eugene Sandulenko | 2014-10-26 09:30:21 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2014-10-26 09:30:21 +0100 |
commit | 522cd1c97082a7cae83b39877d4d33abc6770756 (patch) | |
tree | de5ff5289702e3aab2227d583a6854c3a9d6b6b0 /engines/prince | |
parent | 4fdd9bbab33e00e2520c642bf5cca798b8e6e1b5 (diff) | |
download | scummvm-rg350-522cd1c97082a7cae83b39877d4d33abc6770756.tar.gz scummvm-rg350-522cd1c97082a7cae83b39877d4d33abc6770756.tar.bz2 scummvm-rg350-522cd1c97082a7cae83b39877d4d33abc6770756.zip |
PRINCE: Fix warning
Diffstat (limited to 'engines/prince')
-rw-r--r-- | engines/prince/prince.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp index 17cef6327f..b0f2cd5056 100644 --- a/engines/prince/prince.cpp +++ b/engines/prince/prince.cpp @@ -1901,29 +1901,29 @@ void PrinceEngine::blackPalette() { void PrinceEngine::setPalette(const byte *palette) { if (palette != nullptr) { - byte *blackPalette = (byte *)malloc(256 * 3); + byte *blackPalette_ = (byte *)malloc(256 * 3); int fadeStep = 0; for (int i = 0; i <= kFadeStep; i++) { for (int j = 0; j < 256; j++) { - blackPalette[3 * j] = palette[3 * j] * fadeStep / 4; - blackPalette[3 * j + 1] = palette[3 * j + 1] * fadeStep / 4; - blackPalette[3 * j + 2] = palette[3 * j + 2] * fadeStep / 4; + blackPalette_[3 * j] = palette[3 * j] * fadeStep / 4; + blackPalette_[3 * j + 1] = palette[3 * j + 1] * fadeStep / 4; + blackPalette_[3 * j + 2] = palette[3 * j + 2] * fadeStep / 4; } fadeStep++; - _graph->setPalette(blackPalette); + _graph->setPalette(blackPalette_); _system->updateScreen(); Common::Event event; Common::EventManager *eventMan = _system->getEventManager(); eventMan->pollEvent(event); if (shouldQuit()) { _graph->setPalette(palette); - free(blackPalette); + free(blackPalette_); return; } pause(); } _graph->setPalette(palette); - free(blackPalette); + free(blackPalette_); } } |