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

[fingolfin at users.sourceforge.net]

Revision: 46291
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46291&view=rev
Author:   fingolfin
Date:     2009-12-08 20:44:57 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
Fix some MSVC warnings (part of patch #2909981)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/draw.cpp
    scummvm/trunk/engines/gob/hotspots.cpp
    scummvm/trunk/engines/groovie/cell.cpp
    scummvm/trunk/engines/sci/gui/gui_text.cpp
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/gob/draw.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw.cpp	2009-12-08 20:44:01 UTC (rev 46290)
+++ scummvm/trunk/engines/gob/draw.cpp	2009-12-08 20:44:57 UTC (rev 46291)
@@ -815,7 +815,7 @@
 }
 
 int16 Draw::handleCurWin() {
-	int8 matchNum;
+	int8 matchNum = 0;
 	int16 bestMatch = -1;
 
 	warning("handleCurWin");

Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp	2009-12-08 20:44:01 UTC (rev 46290)
+++ scummvm/trunk/engines/gob/hotspots.cpp	2009-12-08 20:44:57 UTC (rev 46291)
@@ -1606,8 +1606,8 @@
 int16 Hotspots::findCursor(uint16 x, uint16 y) const {
 	int16 cursor = 0;
 
-	int16 deltax;
-	int16 deltay;
+	int16 deltax = 0;
+	int16 deltay = 0;
 	
 	if ( _vm->getGameType() == kGameTypeFascination ) {
 		cursor = curWindow(deltax, deltay);

Modified: scummvm/trunk/engines/groovie/cell.cpp
===================================================================
--- scummvm/trunk/engines/groovie/cell.cpp	2009-12-08 20:44:01 UTC (rev 46290)
+++ scummvm/trunk/engines/groovie/cell.cpp	2009-12-08 20:44:57 UTC (rev 46291)
@@ -749,7 +749,7 @@
 const int8 depths[] = { 1, 1, 1, 2, 1, 1, 2, 2, 1, 2, 2, 2, 3, 2, 2, 3, 3, 2, 3, 3, 3 };
 
 int16 CellGame::calcMove(int8 color, uint16 depth) {
-	int result;
+	int result = 0;
 
 	_flag1 = false;
 	++_moveCount;

Modified: scummvm/trunk/engines/sci/gui/gui_text.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_text.cpp	2009-12-08 20:44:01 UTC (rev 46290)
+++ scummvm/trunk/engines/sci/gui/gui_text.cpp	2009-12-08 20:44:57 UTC (rev 46291)
@@ -355,7 +355,8 @@
 
 // Draws a text in rect.
 void SciGuiText::Box(const char *text, int16 bshow, const Common::Rect &rect, GuiTextAlignment alignment, GuiResourceId fontId) {
-	int16 textWidth, textHeight, charCount, offset;
+	int16 textWidth, textHeight, charCount;
+	int16 offset = 0;
 	int16 hline = 0;
 	GuiResourceId orgFontId = GetFontId();
 	int16 orgPenColor = _gfx->_curPort->penClr;

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-12-08 20:44:01 UTC (rev 46290)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-12-08 20:44:57 UTC (rev 46291)
@@ -955,10 +955,9 @@
 
 	Common::String mask, name;
 	Common::ArchiveMemberList files;
-	int number;
+	int number = -1;
 	const char *szResType;
 	ResourceSource *psrcPatch;
-	bool bAdd;
 
 	for (int i = kResourceTypeView; i < kResourceTypeAudio36; i ++) {
 		files.clear();
@@ -972,7 +971,7 @@
 		mask += resourceTypeSuffixes[i];
 		SearchMan.listMatchingMembers(files, mask);
 		for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); x++) {
-			bAdd = false;
+			bool bAdd = false;
 			name = (*x)->getName();
 			// SCI1 scheme
 			if (isdigit(name[0])) {


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