[Scummvm-cvs-logs] SF.net SVN: scummvm: [24760] scummvm/trunk

[sev at users.sourceforge.net]

Revision: 24760
          http://svn.sourceforge.net/scummvm/?rev=24760&view=rev
Author:   sev
Date:     2006-11-22 07:50:30 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
Fix MSVC2005 warnings. Please, review the changes.

Modified Paths:
--------------
    scummvm/trunk/common/stdafx.h
    scummvm/trunk/engines/agos/contain.cpp
    scummvm/trunk/engines/agos/menus.cpp
    scummvm/trunk/engines/agos/vga_s1.cpp
    scummvm/trunk/engines/cine/part.cpp
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/inter_v2.cpp
    scummvm/trunk/engines/scumm/he/intern_he.h

Modified: scummvm/trunk/common/stdafx.h
===================================================================
--- scummvm/trunk/common/stdafx.h	2006-11-22 15:48:16 UTC (rev 24759)
+++ scummvm/trunk/common/stdafx.h	2006-11-22 15:50:30 UTC (rev 24760)
@@ -51,6 +51,7 @@
 #pragma warning( disable : 4511 ) // turn off "copy constructor could not be generated" warning
 #pragma warning( disable : 4512 ) // turn off "assignment operator could not be generated" warning
 #pragma warning( disable : 4351 ) // turn off "new behavior ... will be default initialized" warning
+#pragma warning( disable : 4505 ) // turn off "unreferenced local function has been removed"
 
 // FIXME: 4702 & 4706 - may be enabled
 #pragma warning( disable : 4702 ) // turn off "unreachable code" warning

Modified: scummvm/trunk/engines/agos/contain.cpp
===================================================================
--- scummvm/trunk/engines/agos/contain.cpp	2006-11-22 15:48:16 UTC (rev 24759)
+++ scummvm/trunk/engines/agos/contain.cpp	2006-11-22 15:50:30 UTC (rev 24760)
@@ -34,7 +34,7 @@
 	if (getGameType() == GType_ELVIRA1) {
 		SubPlayer *p = (SubPlayer *)findChildOfType(y, 3);
 		SubContainer *c = (SubContainer *)findChildOfType(y, 7);
-		int cap;
+		int cap = 0;
 		int wt;
 
 		if ((c == NULL) && (p == NULL))

Modified: scummvm/trunk/engines/agos/menus.cpp
===================================================================
--- scummvm/trunk/engines/agos/menus.cpp	2006-11-22 15:48:16 UTC (rev 24759)
+++ scummvm/trunk/engines/agos/menus.cpp	2006-11-22 15:50:30 UTC (rev 24760)
@@ -128,7 +128,7 @@
 	unlightMenuStrip();
 
 	for (int i = 120; i != 130; i++) {
-		if (a & (1 << i - 120)) {
+		if (a & ((1 << i) - 120)) {
 			enableBox(i);
 			lightMenuBox(i);
 		}

Modified: scummvm/trunk/engines/agos/vga_s1.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_s1.cpp	2006-11-22 15:48:16 UTC (rev 24759)
+++ scummvm/trunk/engines/agos/vga_s1.cpp	2006-11-22 15:50:30 UTC (rev 24760)
@@ -60,8 +60,8 @@
 }
 
 void AGOSEngine::vc22_setPaletteNew() {
-	byte *offs, *palptr, *src;
-	uint16 a = 0, b, num, palSize;
+	byte *offs, *palptr = 0, *src;
+	uint16 a = 0, b, num = 1, palSize = 0;
 
 	a = vcReadNextWord();
 	b = vcReadNextWord();

Modified: scummvm/trunk/engines/cine/part.cpp
===================================================================
--- scummvm/trunk/engines/cine/part.cpp	2006-11-22 15:48:16 UTC (rev 24759)
+++ scummvm/trunk/engines/cine/part.cpp	2006-11-22 15:50:30 UTC (rev 24760)
@@ -336,7 +336,7 @@
 			}
 		}
 
-		const char **bPtr;
+		const char **bPtr = 0;
 
 		if (g_cine->getPlatform() == Common::kPlatformPC) {
 			switch (g_cine->getLanguage()) {

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2006-11-22 15:48:16 UTC (rev 24759)
+++ scummvm/trunk/engines/gob/gob.cpp	2006-11-22 15:50:30 UTC (rev 24760)
@@ -368,7 +368,7 @@
 void GobEngine::loadGame(enum SaveFiles sFile, int16 dataVar, int32 size, int32 offset) {
 	int32 sSize;
 	int32 retSize;
-	int16 index;
+	int16 index = 0;
 	int16 y;
 	char *buf;
 	char *sName;

Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp	2006-11-22 15:48:16 UTC (rev 24759)
+++ scummvm/trunk/engines/gob/inter_v2.cpp	2006-11-22 15:50:30 UTC (rev 24760)
@@ -1332,7 +1332,7 @@
 	int32 offset;
 	int16 dataVar; // si
 	int16 handle;
-	int16 index;
+	int16 index = 0;
 	int16 y;
 	char *buf;
 	bool readPal;

Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h	2006-11-22 15:48:16 UTC (rev 24759)
+++ scummvm/trunk/engines/scumm/he/intern_he.h	2006-11-22 15:50:30 UTC (rev 24760)
@@ -42,7 +42,7 @@
 class LogicHE;
 class MoviePlayer;
 class Sprite;
-class CUP_Player;
+struct CUP_Player;
 #endif
 
 class ScummEngine_v60he : public ScummEngine_v6 {


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