[Scummvm-cvs-logs] SF.net SVN: scummvm: [24054] scummvm/trunk/engines/agos

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Oct 1 12:56:20 CEST 2006


Revision: 24054
          http://svn.sourceforge.net/scummvm/?rev=24054&view=rev
Author:   lordhoto
Date:     2006-10-01 03:56:12 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
Fixed msvc8 build.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/game.cpp
    scummvm/trunk/engines/agos/items.cpp
    scummvm/trunk/engines/agos/vga.cpp

Modified: scummvm/trunk/engines/agos/game.cpp
===================================================================
--- scummvm/trunk/engines/agos/game.cpp	2006-10-01 10:54:57 UTC (rev 24053)
+++ scummvm/trunk/engines/agos/game.cpp	2006-10-01 10:56:12 UTC (rev 24054)
@@ -1515,7 +1515,7 @@
 };
 
 DetectedGame toDetectedGame(const GameDescription &g) {
-	const char *title;
+	const char *title = 0;
 
 	const PlainGameDescriptor *sg = simonGames;
 	while (sg->gameid) {

Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp	2006-10-01 10:54:57 UTC (rev 24053)
+++ scummvm/trunk/engines/agos/items.cpp	2006-10-01 10:56:12 UTC (rev 24054)
@@ -2539,7 +2539,7 @@
 void AGOSEngine::o4_sync() {
 	// 120: sync
 	uint a = getVarOrWord();
-	if (a == 8001 | a == 8101 || a == 8201 || a == 8301 || a == 8401) {
+	if (a == 8001 || a == 8101 || a == 8201 || a == 8301 || a == 8401) {
 		_marks &= ~(1 << 2);
 	}
 	sendSync(a);

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2006-10-01 10:54:57 UTC (rev 24053)
+++ scummvm/trunk/engines/agos/vga.cpp	2006-10-01 10:56:12 UTC (rev 24054)
@@ -1642,7 +1642,7 @@
 
 void AGOSEngine::vc22_setSpritePalette() {
 	byte *offs, *palptr, *src;
-	uint16 a, b, num, palSize;
+	uint16 a = 0, b, num, palSize;
 
 	if (getGameType() != GType_WW)
 		a = vcReadNextWord();


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