[Scummvm-cvs-logs] SF.net SVN: scummvm:[48366] scummvm/branches/branch-1-1-0/engines/agos

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Tue Mar 23 01:42:42 CET 2010


Revision: 48366
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48366&view=rev
Author:   Kirben
Date:     2010-03-23 00:42:42 +0000 (Tue, 23 Mar 2010)

Log Message:
-----------
Backport fix for compiler warning.

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/engines/agos/agos.cpp
    scummvm/branches/branch-1-1-0/engines/agos/agos.h
    scummvm/branches/branch-1-1-0/engines/agos/draw.cpp
    scummvm/branches/branch-1-1-0/engines/agos/event.cpp
    scummvm/branches/branch-1-1-0/engines/agos/vga.cpp
    scummvm/branches/branch-1-1-0/engines/agos/vga_ff.cpp

Modified: scummvm/branches/branch-1-1-0/engines/agos/agos.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/agos/agos.cpp	2010-03-23 00:42:42 UTC (rev 48365)
+++ scummvm/branches/branch-1-1-0/engines/agos/agos.cpp	2010-03-23 00:42:42 UTC (rev 48366)
@@ -205,7 +205,7 @@
 	_beardLoaded = 0;
 	_litBoxFlag = 0;
 	_mortalFlag = 0;
-	_displayScreen = false;
+	_displayFlag = 0;
 	_syncFlag2 = 0;
 	_inCallBack = 0;
 	_cepeFlag = 0;

Modified: scummvm/branches/branch-1-1-0/engines/agos/agos.h
===================================================================
--- scummvm/branches/branch-1-1-0/engines/agos/agos.h	2010-03-23 00:42:42 UTC (rev 48365)
+++ scummvm/branches/branch-1-1-0/engines/agos/agos.h	2010-03-23 00:42:42 UTC (rev 48366)
@@ -299,7 +299,7 @@
 	bool _beardLoaded;
 	bool _litBoxFlag;
 	bool _mortalFlag;
-	bool _displayScreen;
+	uint16 _displayFlag;
 	bool _syncFlag2;
 	bool _inCallBack;
 	bool _cepeFlag;

Modified: scummvm/branches/branch-1-1-0/engines/agos/draw.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/agos/draw.cpp	2010-03-23 00:42:42 UTC (rev 48365)
+++ scummvm/branches/branch-1-1-0/engines/agos/draw.cpp	2010-03-23 00:42:42 UTC (rev 48366)
@@ -111,7 +111,7 @@
 		drawImage_init(vsp->image, vsp->palette, vsp->x, vsp->y, vsp->flags);
 	}
 
-	_displayScreen = true;
+	_displayFlag++;
 }
 
 void AGOSEngine_Feeble::animateSprites() {
@@ -146,7 +146,7 @@
 		vsp++;
 	}
 
-	_displayScreen = true;
+	_displayFlag++;
 }
 #endif
 
@@ -298,7 +298,7 @@
 	if (_window4Flag == 1)
 		_window4Flag++;
 
-	_displayScreen = true;
+	_displayFlag++;
 }
 
 void AGOSEngine::dirtyClips() {

Modified: scummvm/branches/branch-1-1-0/engines/agos/event.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/agos/event.cpp	2010-03-23 00:42:42 UTC (rev 48365)
+++ scummvm/branches/branch-1-1-0/engines/agos/event.cpp	2010-03-23 00:42:42 UTC (rev 48366)
@@ -175,9 +175,9 @@
 
 	_videoLockOut |= 0x10;
 
-	if (_displayScreen) {
+	if (_displayFlag) {
 		displayScreen();
-		_displayScreen = false;
+		_displayFlag = 0;
 	}
 }
 
@@ -593,7 +593,7 @@
 		animateSprites();
 	}
 
-	if (_displayScreen) {
+	if (_displayFlag) {
 		if (getGameType() == GType_FF && !(getFeatures() & GF_DEMO)) {
 			if (!getBitFlag(78)) {
 				oracleLogo();
@@ -604,7 +604,7 @@
 		}
 		handleMouseMoved();
 		displayScreen();
-		_displayScreen = false;
+		_displayFlag = 0;
 	}
 
 	_videoLockOut &= ~2;
@@ -642,9 +642,9 @@
 			processVgaEvents();
 	}
 
-	if (_displayScreen) {
+	if (_displayFlag) {
 		displayScreen();
-		_displayScreen = false;
+		_displayFlag = 0;
 	}
 
 	_videoLockOut &= ~2;
@@ -668,9 +668,9 @@
 			processVgaEvents();
 	}
 
-	if (_displayScreen) {
+	if (_displayFlag) {
 		displayScreen();
-		_displayScreen = false;
+		_displayFlag = 0;
 	}
 
 	_videoLockOut &= ~2;

Modified: scummvm/branches/branch-1-1-0/engines/agos/vga.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/agos/vga.cpp	2010-03-23 00:42:42 UTC (rev 48365)
+++ scummvm/branches/branch-1-1-0/engines/agos/vga.cpp	2010-03-23 00:42:42 UTC (rev 48366)
@@ -1299,7 +1299,7 @@
 }
 
 void AGOSEngine::vc36_setWindowImage() {
-	_displayScreen = false;
+	_displayFlag = 0;
 	uint16 vga_res = vcReadNextWord();
 	uint16 windowNum = vcReadNextWord();
 	setWindowImage(windowNum, vga_res);
@@ -1321,7 +1321,7 @@
 
 	if (!(_videoLockOut & 0x20)) {
 		_paletteFlag = 1;
-		_displayScreen++;
+		_displayFlag++;
 	}
 }
 

Modified: scummvm/branches/branch-1-1-0/engines/agos/vga_ff.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/agos/vga_ff.cpp	2010-03-23 00:42:42 UTC (rev 48365)
+++ scummvm/branches/branch-1-1-0/engines/agos/vga_ff.cpp	2010-03-23 00:42:42 UTC (rev 48366)
@@ -71,7 +71,7 @@
 }
 
 void AGOSEngine_Feeble::vc36_setWindowImage() {
-	_displayScreen = false;
+	_displayFlag = 0;
 	vcReadNextWord();
 	vcReadNextWord();
 	fillBackGroundFromFront();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list