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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed May 9 17:48:18 CEST 2007


Revision: 26793
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26793&view=rev
Author:   thebluegr
Date:     2007-05-09 08:48:18 -0700 (Wed, 09 May 2007)

Log Message:
-----------
Fix compilation with MSVC8

Modified Paths:
--------------
    scummvm/trunk/engines/agos/gfx.cpp

Modified: scummvm/trunk/engines/agos/gfx.cpp
===================================================================
--- scummvm/trunk/engines/agos/gfx.cpp	2007-05-09 15:36:05 UTC (rev 26792)
+++ scummvm/trunk/engines/agos/gfx.cpp	2007-05-09 15:48:18 UTC (rev 26793)
@@ -628,7 +628,7 @@
 	if (getFeatures() & GF_32COLOR)
 		state->palette = 0xC0;
 
-	uint16 xoffs, yoffs;
+	uint16 xoffs = 0, yoffs = 0;
 	if (!_oldDrawMethod) {
 		if (getGameType() == GType_SIMON1 && (_subroutine == 2923 || _subroutine == 2926)) {
 			// Allow one section of Simon the Sorcerer 1 introduction to be displayed
@@ -796,7 +796,7 @@
 	if (drawImage_clip(state) == 0)
 		return;
 
-	uint16 xoffs, yoffs;
+	uint16 xoffs = 0, yoffs = 0;
 	if (getGameType() == GType_WW) {
 		if (_windowNum == 4 || (_windowNum >= 10 && _windowNum <= 27)) {
 			state->surf_addr = _window4BackScn;
@@ -1302,8 +1302,8 @@
 		uint height = _videoWindows[updateWindow * 4 + 3];
 
 		byte *dst = getBackGround() + xoffs + yoffs * _screenWidth;
-		byte *src;
-		uint srcWidth;
+		byte *src = dst;
+		uint srcWidth = 0;
 
 		if (getGameType() == GType_SIMON2) {
 			src = _window4BackScn + xoffs + yoffs * 320;


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