diff options
| author | Eugene Sandulenko | 2019-08-27 01:19:21 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-09-03 17:17:35 +0200 |
| commit | 100ea9ff0e2517d9c61dccd8378e74333b91cb2a (patch) | |
| tree | 9d5643b4d6a32c0db426e6f271d97dac808b8dba | |
| parent | 373002d3039192b56b46b1ad09035f3cbfa13202 (diff) | |
| download | scummvm-rg350-100ea9ff0e2517d9c61dccd8378e74333b91cb2a.tar.gz scummvm-rg350-100ea9ff0e2517d9c61dccd8378e74333b91cb2a.tar.bz2 scummvm-rg350-100ea9ff0e2517d9c61dccd8378e74333b91cb2a.zip | |
HDB: Fix warnings
| -rw-r--r-- | engines/hdb/gfx.cpp | 3 | ||||
| -rw-r--r-- | engines/hdb/hdb.cpp | 2 | ||||
| -rw-r--r-- | engines/hdb/window.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/engines/hdb/gfx.cpp b/engines/hdb/gfx.cpp index 83061ac05c..d7bb470db8 100644 --- a/engines/hdb/gfx.cpp +++ b/engines/hdb/gfx.cpp @@ -381,7 +381,6 @@ void Gfx::updateFade() { uint8 r, g, b; uint16 value; uint16 *ptr; - static int waitAFrame = 0; if (!_fadeInfo.active && !_fadeInfo.stayFaded) return; @@ -445,6 +444,8 @@ void Gfx::updateFade() { } else { _fadeBuffer2.blitFrom(_globalSurface); + static int waitAFrame = 0; + do { // Copy pristine copy of background to modification buffer _fadeBuffer1.blitFrom(_fadeBuffer2); diff --git a/engines/hdb/hdb.cpp b/engines/hdb/hdb.cpp index b8aa0fdf4f..c7c206c145 100644 --- a/engines/hdb/hdb.cpp +++ b/engines/hdb/hdb.cpp @@ -949,7 +949,7 @@ Common::Error HDBGame::run() { strcpy(mapname, "CINE_OUTRO"); if (isDemo()) - strncat(mapname, "_DEMO", 20); + strcat(mapname, "_DEMO"); debug("Starting level %s in %s", mapname, getActionMode() ? "Action Mode" : "Puzzle Mode"); diff --git a/engines/hdb/window.cpp b/engines/hdb/window.cpp index d10ccacb74..044347ce08 100644 --- a/engines/hdb/window.cpp +++ b/engines/hdb/window.cpp @@ -474,8 +474,8 @@ void Window::loadSaveFile(Common::InSaveFile *in) { in->read(t->text, 128); t->x = in->readSint32LE(); t->y = in->readSint32LE(); - t->timer = in->readUint32LE(); - t->timer = g_system->getMillis() + 1000; + (void)in->readUint32LE(); // Skip timer value + t->timer = g_system->getMillis() + 1000; // And override it to a second _textOutList.push_back(t); } |