diff options
author | Travis Howell | 2010-03-23 00:42:42 +0000 |
---|---|---|
committer | Travis Howell | 2010-03-23 00:42:42 +0000 |
commit | 9f53578fd2dcdd72c3bea2a4a7d92f342ae6a40f (patch) | |
tree | aa16fe6d359c3cd295d21e7d36ca2eb1c51ceefd /engines/agos | |
parent | 6545e728b6b76e41d711858b209accfe9cc1f6da (diff) | |
download | scummvm-rg350-9f53578fd2dcdd72c3bea2a4a7d92f342ae6a40f.tar.gz scummvm-rg350-9f53578fd2dcdd72c3bea2a4a7d92f342ae6a40f.tar.bz2 scummvm-rg350-9f53578fd2dcdd72c3bea2a4a7d92f342ae6a40f.zip |
Fix compiler warning.
svn-id: r48365
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/agos.cpp | 2 | ||||
-rw-r--r-- | engines/agos/agos.h | 2 | ||||
-rw-r--r-- | engines/agos/draw.cpp | 6 | ||||
-rw-r--r-- | engines/agos/event.cpp | 16 | ||||
-rw-r--r-- | engines/agos/vga.cpp | 4 | ||||
-rw-r--r-- | engines/agos/vga_ff.cpp | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index ab2fe39d4e..38112bc14a 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -205,7 +205,7 @@ AGOSEngine::AGOSEngine(OSystem *syst) _beardLoaded = 0; _litBoxFlag = 0; _mortalFlag = 0; - _displayScreen = false; + _displayFlag = 0; _syncFlag2 = 0; _inCallBack = 0; _cepeFlag = 0; diff --git a/engines/agos/agos.h b/engines/agos/agos.h index ff42306ea0..ab1009e02a 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -300,7 +300,7 @@ protected: bool _beardLoaded; bool _litBoxFlag; bool _mortalFlag; - bool _displayScreen; + uint16 _displayFlag; bool _syncFlag2; bool _inCallBack; bool _cepeFlag; diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp index e98d0b59ea..300ed4c52b 100644 --- a/engines/agos/draw.cpp +++ b/engines/agos/draw.cpp @@ -111,7 +111,7 @@ void AGOSEngine_Feeble::animateSpritesByY() { drawImage_init(vsp->image, vsp->palette, vsp->x, vsp->y, vsp->flags); } - _displayScreen = true; + _displayFlag++; } void AGOSEngine_Feeble::animateSprites() { @@ -146,7 +146,7 @@ void AGOSEngine_Feeble::animateSprites() { vsp++; } - _displayScreen = true; + _displayFlag++; } #endif @@ -298,7 +298,7 @@ void AGOSEngine::animateSprites() { if (_window4Flag == 1) _window4Flag++; - _displayScreen = true; + _displayFlag++; } void AGOSEngine::dirtyClips() { diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index f22a2e69e9..1340d85236 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -175,9 +175,9 @@ void AGOSEngine::haltAnimation() { _videoLockOut |= 0x10; - if (_displayScreen) { + if (_displayFlag) { displayScreen(); - _displayScreen = false; + _displayFlag = 0; } } @@ -593,7 +593,7 @@ void AGOSEngine_Feeble::timerProc() { animateSprites(); } - if (_displayScreen) { + if (_displayFlag) { if (getGameType() == GType_FF && !(getFeatures() & GF_DEMO)) { if (!getBitFlag(78)) { oracleLogo(); @@ -604,7 +604,7 @@ void AGOSEngine_Feeble::timerProc() { } handleMouseMoved(); displayScreen(); - _displayScreen = false; + _displayFlag = 0; } _videoLockOut &= ~2; @@ -642,9 +642,9 @@ void AGOSEngine_PN::timerProc() { processVgaEvents(); } - if (_displayScreen) { + if (_displayFlag) { displayScreen(); - _displayScreen = false; + _displayFlag = 0; } _videoLockOut &= ~2; @@ -668,9 +668,9 @@ void AGOSEngine::timerProc() { processVgaEvents(); } - if (_displayScreen) { + if (_displayFlag) { displayScreen(); - _displayScreen = false; + _displayFlag = 0; } _videoLockOut &= ~2; diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp index 35e87060a9..dd2df79c07 100644 --- a/engines/agos/vga.cpp +++ b/engines/agos/vga.cpp @@ -1299,7 +1299,7 @@ void AGOSEngine::vc35_clearWindow() { } void AGOSEngine::vc36_setWindowImage() { - _displayScreen = false; + _displayFlag = 0; uint16 vga_res = vcReadNextWord(); uint16 windowNum = vcReadNextWord(); setWindowImage(windowNum, vga_res); @@ -1321,7 +1321,7 @@ void AGOSEngine::vc37_pokePalette() { if (!(_videoLockOut & 0x20)) { _paletteFlag = 1; - _displayScreen++; + _displayFlag++; } } diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp index 5b2bbc1d90..0a6458ac11 100644 --- a/engines/agos/vga_ff.cpp +++ b/engines/agos/vga_ff.cpp @@ -71,7 +71,7 @@ int AGOSEngine::getScale(int16 y, int16 x) { } void AGOSEngine_Feeble::vc36_setWindowImage() { - _displayScreen = false; + _displayFlag = 0; vcReadNextWord(); vcReadNextWord(); fillBackGroundFromFront(); |