[Scummvm-cvs-logs] scummvm master -> 5518721a17e751a2ac6deefe56ef0ce446f184ab

wjp wjp at usecode.org
Sun Nov 27 14:02:06 CET 2011


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:
5518721a17 TSAGE: Work around some uninitialized use warnings


Commit: 5518721a17e751a2ac6deefe56ef0ce446f184ab
    https://github.com/scummvm/scummvm/commit/5518721a17e751a2ac6deefe56ef0ce446f184ab
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-27T05:00:14-08:00

Commit Message:
TSAGE: Work around some uninitialized use warnings

They were false positives, but easy to work around.

Changed paths:
    engines/tsage/blue_force/blueforce_scenes3.cpp
    engines/tsage/core.cpp
    engines/tsage/globals.cpp



diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 1dea7f7..a63f45d 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -4350,7 +4350,7 @@ void Scene360::Action1::signal() {
 void Scene360::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
 	if (s.getVersion() < 9) {
-		int tmpVar;
+		int tmpVar = 0;
 		s.syncAsSint16LE(tmpVar);
 	}
 }
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index b991e46..266d39a 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -3710,7 +3710,7 @@ int WalkRegions::indexOf(const Common::Point &pt, const Common::List<int> *index
 
 void WalkRegions::synchronize(Serializer &s) {
 	// Synchronise the list of disabled regions as a list of values terminated with a '-1'
-	int regionId;
+	int regionId = 0;
 	if (s.isLoading()) {
 		_disabledRegions.clear();
 
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index ad1ae04..0b59fd4 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -230,7 +230,7 @@ void BlueForceGlobals::synchronize(Serializer &s) {
 
 	s.syncAsSint16LE(_dayNumber);
 	if (s.getVersion() < 9) {
-		int tmpVar;
+		int tmpVar = 0;
 		s.syncAsSint16LE(tmpVar);
 	}
 	s.syncAsSint16LE(_tonyDialogCtr);






More information about the Scummvm-git-logs mailing list