[Scummvm-cvs-logs] scummvm master -> 21fa7bda57c2656db5abd68fdabe0bcd5f292e18

Strangerke Strangerke at scummvm.org
Sat Nov 5 17:41:19 CET 2011


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:
f691cadfc1 HUGO: Fix a CppCheck warning reported by Tetsuo55
21fa7bda57 TSAGE: Blue Force - Inside PD (315): Implement a missing case in signal()


Commit: f691cadfc14ef8a358e9b9409a4f8b58f3348d0e
    https://github.com/scummvm/scummvm/commit/f691cadfc14ef8a358e9b9409a4f8b58f3348d0e
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-11-05T09:40:16-07:00

Commit Message:
HUGO: Fix a CppCheck warning reported by Tetsuo55

Changed paths:
    engines/hugo/schedule.cpp



diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp
index 384b3ac..6a4fd88 100644
--- a/engines/hugo/schedule.cpp
+++ b/engines/hugo/schedule.cpp
@@ -1540,6 +1540,8 @@ void Scheduler_v1d::promptAction(act *action) {
 
 	char resp[256];
 	strncpy(resp, response.c_str(), 256);
+	if (response.size() > 256)
+		resp[255] = '\0';
 
 	if (action->a3.encodedFl)
 		decodeString(resp);
@@ -1587,6 +1589,8 @@ void Scheduler_v2d::promptAction(act *action) {
 
 	char resp[256];
 	strncpy(resp, response.c_str(), 256);
+	if (response.size() > 256)
+		resp[255] = '\0';
 
 	for (int dx = 0; !found && (action->a3.responsePtr[dx] != -1); dx++) {
 		tmpStr = _vm->_file->fetchString(action->a3.responsePtr[dx]);


Commit: 21fa7bda57c2656db5abd68fdabe0bcd5f292e18
    https://github.com/scummvm/scummvm/commit/21fa7bda57c2656db5abd68fdabe0bcd5f292e18
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-11-05T09:40:17-07:00

Commit Message:
TSAGE: Blue Force - Inside PD (315): Implement a missing case in signal()

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



diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index cd664df..be102b9 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -1287,6 +1287,10 @@ void Scene315::signal() {
 		BF_GLOBALS._player.enableControl();
 		_object9.remove();
 		break;
+	case 3169:
+		T2_GLOBALS._uiElements.addScore(30);
+		BF_INVENTORY.setObjectScene(INV_MUG_SHOT, 1);
+		BF_GLOBALS._player.enableControl();
 	case 3154:
 	default:
 		break;






More information about the Scummvm-git-logs mailing list