[Scummvm-cvs-logs] scummvm master -> 7f86d151930298e5c2866d47f4f5c41ceb1f1f08

Strangerke Strangerke at scummvm.org
Tue Oct 29 23:12:10 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:
7f86d15193 TSAGE: FIX CID 1003725, 1003726, 1002380, 1002379


Commit: 7f86d151930298e5c2866d47f4f5c41ceb1f1f08
    https://github.com/scummvm/scummvm/commit/7f86d151930298e5c2866d47f4f5c41ceb1f1f08
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-29T15:10:14-07:00

Commit Message:
TSAGE: FIX CID 1003725, 1003726, 1002380, 1002379

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp
    engines/tsage/ringworld2/ringworld2_scenes0.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index d1d4fab..7fc0af0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -2352,6 +2352,14 @@ Scene205::Scene205(): SceneExt() {
 	GfxFont font;
 	font.setFontNumber(4);
 	_fontHeight = font.getHeight();
+	
+	for (int i = 0; i < 3; i++) {
+		_objList1[i] = nullptr;
+		_objList2[i] = nullptr;
+	}
+
+	for (int i = 0; i < 4; i++)
+		_objList3[i] = nullptr;
 }
 
 void Scene205::postInit(SceneObjectList *OwnerList) {
@@ -4253,6 +4261,7 @@ void Scene325::consoleAction(int id) {
 		_icon2.setIcon(24);
 		_icon3.setIcon(25);
 		_icon4.setIcon(26);
+		break;
 	case 2:
 	case 16:
 	case 17:
@@ -4363,6 +4372,7 @@ void Scene325::consoleAction(int id) {
 		break;
 	case 8:
 		R2_GLOBALS._sceneManager.changeScene(300);
+		break;
 	case 9:
 	case 10:
 		_iconFontNumber = (id - 1) == 9 ? 50 : 52;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index fe42f1e..3662a20 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -213,7 +213,6 @@ public:
 	int _field412, _field480;
 	int _field482, _frameInc;
 	int _fontNumber, _fontHeight;
-	int _scene180Mode;
 public:
 	Scene180();
 






More information about the Scummvm-git-logs mailing list