From 522cd1c97082a7cae83b39877d4d33abc6770756 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 26 Oct 2014 09:30:21 +0100 Subject: PRINCE: Fix warning --- engines/prince/prince.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'engines/prince/prince.cpp') 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_); } } -- cgit v1.2.3