[Scummvm-cvs-logs] scummvm master -> effd02bdc13739c0c4cadf272469fb545198b573

sev- sev at scummvm.org
Sun Feb 14 17:34:38 CET 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
effd02bdc1 WAGE: Fix uninit members


Commit: effd02bdc13739c0c4cadf272469fb545198b573
    https://github.com/scummvm/scummvm/commit/effd02bdc13739c0c4cadf272469fb545198b573
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-14T17:33:52+01:00

Commit Message:
WAGE: Fix uninit members

Changed paths:
    engines/wage/design.cpp
    engines/wage/gui.cpp



diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index 44891f1..247d989 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -381,7 +381,7 @@ void Design::drawBitmap(Graphics::Surface *surface, Common::SeekableReadStream &
 	while (numBytes > 0 && y < h) {
 		int n = in.readSByte();
 		int count;
-		int b;
+		int b = 0;
 		int state = 0;
 
 		numBytes--;
@@ -399,7 +399,7 @@ void Design::drawBitmap(Graphics::Surface *surface, Common::SeekableReadStream &
 		}
 
 		for (int i = 0; i < count && y < h; i++) {
-			byte color;
+			byte color = 0;
 			if (state == 1) {
 				color = in.readByte();
 				numBytes--;
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index f7196ab..a2931f9 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -199,7 +199,7 @@ void Gui::undrawCursor() {
 }
 
 const Graphics::Font *Gui::getFont(const char *name, Graphics::FontManager::FontUsage fallback) {
-	const Graphics::Font *font;
+	const Graphics::Font *font = 0;
 
 	if (!_builtInFonts) {
 		font = FontMan.getFontByName(name);






More information about the Scummvm-git-logs mailing list