[Scummvm-cvs-logs] SF.net SVN: scummvm:[49030] scummvm/trunk/engines/sci/graphics

[thebluegr at users.sourceforge.net]

Revision: 49030
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49030&view=rev
Author:   thebluegr
Date:     2010-05-14 15:21:00 +0000 (Fri, 14 May 2010)

Log Message:
-----------
Silenced some MSVC warnings

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/controls.cpp
    scummvm/trunk/engines/sci/graphics/text16.cpp

Modified: scummvm/trunk/engines/sci/graphics/controls.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/controls.cpp	2010-05-14 11:49:09 UTC (rev 49029)
+++ scummvm/trunk/engines/sci/graphics/controls.cpp	2010-05-14 15:21:00 UTC (rev 49030)
@@ -147,7 +147,7 @@
 	uint16 maxChars = GET_SEL32V(_segMan, controlObject, SELECTOR(max));
 	reg_t textReference = GET_SEL32(_segMan, controlObject, SELECTOR(text));
 	Common::String text;
-	uint16 textSize, eventType, eventKey;
+	uint16 textSize, eventType, eventKey = 0;
 	bool textChanged = false;
 	bool textAddChar = false;
 	Common::Rect rect;
@@ -251,7 +251,7 @@
 }
 
 void GfxControls::kernelDrawButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite) {
-	int16 sci0EarlyPen, sci0EarlyBack;
+	int16 sci0EarlyPen = 0, sci0EarlyBack = 0;
 	if (!hilite) {
 		if (getSciVersion() == SCI_VERSION_0_EARLY) {
 			// SCI0early actually used hardcoded green/black buttons instead of using the port colors

Modified: scummvm/trunk/engines/sci/graphics/text16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/text16.cpp	2010-05-14 11:49:09 UTC (rev 49029)
+++ scummvm/trunk/engines/sci/graphics/text16.cpp	2010-05-14 15:21:00 UTC (rev 49030)
@@ -159,7 +159,7 @@
 
 // return max # of chars to fit maxwidth with full words, does not include breaking space
 int16 GfxText16::GetLongest(const char *text, int16 maxWidth, GuiResourceId orgFontId) {
-	uint16 curChar;
+	uint16 curChar = 0;
 	int16 maxChars = 0, curCharCount = 0;
 	uint16 width = 0;
 	GuiResourceId oldFontId = GetFontId();


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