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

Strangerke Strangerke at scummvm.org
Mon Jan 26 23:17:51 CET 2015


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

Summary:
46c3b8c318 TSAGE: Ringworld - Fix unitialized variable
3e8456e0f8 TSAGE: Ringworld - Fix unitialized variable
27febf8574 TSAGE: Ringworld - Declare _sitFl as a boolean
7ebd6c974c VOYEUR: Fix bug in vDoCycleInt
e8c9a828da TSAGE: Fix 3 uninitialized variables


Commit: 46c3b8c3187736e12c433104de7ad247f31534a5
    https://github.com/scummvm/scummvm/commit/46c3b8c3187736e12c433104de7ad247f31534a5
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-26T22:59:04+01:00

Commit Message:
TSAGE: Ringworld - Fix unitialized variable

Changed paths:
    engines/tsage/blue_force/blueforce_scenes8.cpp



diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index 698162c..337e73d 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -2221,6 +2221,7 @@ Scene840::Scene840(): PalettedScene() {
 	_field1AC2 = 0;
 	_field1AC4 = 0;
 	_field1AC6 = (BF_GLOBALS._dayNumber > 3) ? 1 : 0;
+	_field1ABA = 0;
 }
 
 void Scene840::synchronize(Serializer &s) {


Commit: 3e8456e0f861b968410c3ab4a750be52f522b743
    https://github.com/scummvm/scummvm/commit/3e8456e0f861b968410c3ab4a750be52f522b743
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-26T22:59:32+01:00

Commit Message:
TSAGE: Ringworld - Fix unitialized variable

Changed paths:
    engines/tsage/ringworld/ringworld_scenes3.cpp



diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index d8556c6..735722a 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -5789,6 +5789,7 @@ Scene2320::Scene2320() :
 	_area3._pt = Common::Point(200, 75);
 	_area4.setup(2153, 1, 1, 10);
 	_area4._pt = Common::Point(237, 77);
+	_hotspotPtr = nullptr;
 }
 
 void Scene2320::postInit(SceneObjectList *OwnerList) {


Commit: 27febf8574c81c43375067346f9733df37f2d6d2
    https://github.com/scummvm/scummvm/commit/27febf8574c81c43375067346f9733df37f2d6d2
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-26T23:13:40+01:00

Commit Message:
TSAGE: Ringworld - Declare _sitFl as a boolean

Changed paths:
    engines/tsage/ringworld/ringworld_scenes3.cpp
    engines/tsage/ringworld/ringworld_scenes3.h



diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index 735722a..a515224 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -494,7 +494,7 @@ void Scene2100::Action1::signal() {
 			setDelay(1);
 		else {
 			setAction(&scene->_sequenceManager, this, 2102, &g_globals->_player, NULL);
-			scene->_sitFl = 0;
+			scene->_sitFl = false;
 		}
 		break;
 	case 1: {
@@ -1548,6 +1548,7 @@ Scene2100::Scene2100() :
 	_area3._pt = Common::Point(200, 75);
 	_area4.setup(2153, 1, 1, OBJECT_TRANSLATOR);
 	_area4._pt = Common::Point(237, 77);
+	_sitFl = false;
 }
 
 void Scene2100::postInit(SceneObjectList *OwnerList) {
@@ -1688,7 +1689,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) {
 	g_globals->_player._moveDiff.x = 4;
 	g_globals->_player.changeZoom(-1);
 	g_globals->_player.disableControl();
-	_sitFl = 0;
+	_sitFl = false;
 
 	switch (g_globals->_sceneManager._previousScene) {
 	case 2120:
@@ -1824,7 +1825,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) {
 		g_globals->_player.fixPriority(152);
 		g_globals->_player.setStrip(2);
 
-		_sitFl = 1;
+		_sitFl = true;
 
 		_object4.postInit();
 		_object4.setVisage(2102);
@@ -1858,7 +1859,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) {
 			g_globals->_player.fixPriority(152);
 			g_globals->_player.setStrip(2);
 
-			_sitFl = 1;
+			_sitFl = true;
 			setAction(&_action16);
 		}
 		break;
@@ -1932,12 +1933,12 @@ void Scene2100::stripCallback(int v) {
 void Scene2100::signal() {
 	switch (_sceneMode) {
 	case 2101:
-		_sitFl = 1;
+		_sitFl = true;
 		g_globals->_player._uiEnabled = true;
 		g_globals->_events.setCursor(CURSOR_USE);
 		break;
 	case 2102:
-		_sitFl = 0;
+		_sitFl = false;
 		g_globals->_player.enableControl();
 		break;
 	case 2103:
diff --git a/engines/tsage/ringworld/ringworld_scenes3.h b/engines/tsage/ringworld/ringworld_scenes3.h
index a371f80..752b6ac 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.h
+++ b/engines/tsage/ringworld/ringworld_scenes3.h
@@ -283,7 +283,7 @@ public:
 	Action15 _action15;
 	Action16 _action16;
 	Action17 _action17;
-	int _sitFl;
+	bool _sitFl;
 	SceneArea _area1, _area2, _area3, _area4;
 
 	Scene2100();


Commit: 7ebd6c974cb0aed319b2f7c6a38f909a920b4e6c
    https://github.com/scummvm/scummvm/commit/7ebd6c974cb0aed319b2f7c6a38f909a920b4e6c
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-26T23:14:16+01:00

Commit Message:
VOYEUR: Fix bug in vDoCycleInt

Changed paths:
    engines/voyeur/events.cpp



diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 7ce7351..320c922 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -403,7 +403,7 @@ void EventsManager::vDoCycleInt() {
 					int palIndex = READ_LE_UINT16(pSrc);
 					pPal[palIndex * 3] = pSrc[3];
 					pPal[palIndex * 3 + 1] = pSrc[4];
-					pPal[palIndex * 3 + 1] = pSrc[5];
+					pPal[palIndex * 3 + 2] = pSrc[5];
 					pSrc += 6;
 
 					if ((int16)READ_LE_UINT16(pSrc) >= 0) {


Commit: e8c9a828da890fb6803629e66f18f9096ca03e8e
    https://github.com/scummvm/scummvm/commit/e8c9a828da890fb6803629e66f18f9096ca03e8e
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-26T23:14:42+01:00

Commit Message:
TSAGE: Fix 3 uninitialized variables

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index f35aa58..3105a90 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -56,6 +56,9 @@ InvObject::InvObject(int sceneNumber, int rlbNum, int cursorNum, CursorType curs
 	_bounds = s.getBounds();
 
 	DEALLOCATE(imgData);
+	_visage = 0;
+	_strip = 0;
+	_frame = 0;
 }
 
 InvObject::InvObject(int visage, int strip, int frame) {






More information about the Scummvm-git-logs mailing list