[Scummvm-git-logs] scummvm master -> 0706da838442f71cbcd7ffd4db9da1e932c06ac5

dreammaster dreammaster at scummvm.org
Wed Feb 22 03:22:18 CET 2017


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

Summary:
902ce47c05 TSAGE: R2R: Don't allow F8 to start credits when they're already on
0706da8384 TITANIC: Assert dynamic_cast result in CBellot::Use


Commit: 902ce47c059f3263685d0324f8da51fca059dc02
    https://github.com/scummvm/scummvm/commit/902ce47c059f3263685d0324f8da51fca059dc02
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-21T21:21:32-05:00

Commit Message:
TSAGE: R2R: Don't allow F8 to start credits when they're already on

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


diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index b41abe8..e8d5110 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1228,7 +1228,8 @@ void Ringworld2Game::processEvent(Event &event) {
 
 		case Common::KEYCODE_F8:
 			// F8 - Credits
-			R2_GLOBALS._sceneManager.changeScene(205);
+			if (R2_GLOBALS._sceneManager._sceneNumber != 205)
+				R2_GLOBALS._sceneManager.changeScene(205);
 			break;
 
 		case Common::KEYCODE_F10:


Commit: 0706da838442f71cbcd7ffd4db9da1e932c06ac5
    https://github.com/scummvm/scummvm/commit/0706da838442f71cbcd7ffd4db9da1e932c06ac5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-21T21:22:10-05:00

Commit Message:
TITANIC: Assert dynamic_cast result in CBellot::Use

Changed paths:
    engines/titanic/npcs/bellbot.cpp


diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index 36c57fe..1782161 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -135,7 +135,9 @@ bool CBellBot::MovieEndMsg(CMovieEndMsg *msg) {
 }
 
 bool CBellBot::Use(CUse *msg) {
-	dynamic_cast<CCarry *>(msg->_item)->_npcUse = "Bellbot";
+	CCarry *item = dynamic_cast<CCarry *>(msg->_item);
+	assert(item);
+	item->_npcUse = "Bellbot";
 	return true;
 }
 





More information about the Scummvm-git-logs mailing list