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

Strangerke Strangerke at scummvm.org
Tue Oct 29 00:13:56 CET 2013


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:
f938743b06 TSAGE: Fix CID 1003935, 1003723, 1002377 and 1002376


Commit: f938743b06c22e3b2f22a70c6ffa0150bd87cb94
    https://github.com/scummvm/scummvm/commit/f938743b06c22e3b2f22a70c6ffa0150bd87cb94
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-28T16:11:57-07:00

Commit Message:
TSAGE: Fix CID 1003935, 1003723, 1002377 and 1002376

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index a57395b..919af14 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1896,6 +1896,7 @@ void Scene1200::process(Event &event) {
 						SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 						break;
 					}
+					break;
 				case 33:
 					R2_GLOBALS._sceneManager.changeScene(3245);
 					break;
@@ -2242,6 +2243,11 @@ Scene1337::Scene1337() {
 	_field424A = 0;
 	_field424C = 0;
 	_field424E = 0;
+
+	_unkFctPtr412 = nullptr;
+	_field3EF0 = nullptr;
+	_field3EF4 = nullptr;
+	_field3EF8 = nullptr;
 }
 
 void Scene1337::synchronize(Serializer &s) {
@@ -4947,7 +4953,7 @@ void Scene1337::subC2C2F() {
 
 		if (!found) {
 			for (int i = 0; i <= 7; i++) {
-				if ((_arrunkObj1337[3]._arr2[i]._field34 == 1) && (!subC2687(_arrunkObj1337[3]._arr3[i]._field34))) {
+				if ((_arrunkObj1337[3]._arr2[i]._field34 == 1) && (!subC2687(_arrunkObj1337[3]._arr3[0]._field34))) {
 					int tmpVal = 0;
 
 					for (int j = 0; j <= 7; j++) {
@@ -10915,6 +10921,8 @@ Scene1750::Scene1750() {
 	_field419 = 0;
 	_field41B = 0;
 	_field41D = 0;
+
+	_rotation = nullptr;
 }
 
 void Scene1750::synchronize(Serializer &s) {






More information about the Scummvm-git-logs mailing list