[Scummvm-cvs-logs] scummvm master -> 1d3e5f86f06d4171a885a64f042eebbb2fd7aae7

[Strangerke]

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:
20061c101d MADS: Rex - Remove dead code also present in the original in the logic of scene 5
1d3e5f86f0 MADS: Rex - Reduce the scope of some variables in TextView


Commit: 20061c101dd5687ec1a1f68379dcf54a9cea8a0b
    https://github.com/scummvm/scummvm/commit/20061c101dd5687ec1a1f68379dcf54a9cea8a0b
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-10T07:31:52+02:00

Commit Message:
MADS: Rex - Remove dead code also present in the original in the logic of scene 5

Changed paths:
    engines/mads/nebular/nebular_scenes5.cpp



diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 5a67d15..66d8294 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -2847,8 +2847,6 @@ void Scene551::actions() {
 		_vm->_dialogs->show(55113);
 	else if (_action.isAction(VERB_LOOK, NOUN_TELEPORTER))
 		_vm->_dialogs->show(55114);
-	else if (_action.isAction(VERB_LOOK, NOUN_BUILDING))
-		_vm->_dialogs->show(55115);
 	else if (_action.isAction(VERB_LOOK, NOUN_SIDEWALK_TO_WEST)) {
 		if (_game._visitedScenes.exists(505))
 			_vm->_dialogs->show(55116);


Commit: 1d3e5f86f06d4171a885a64f042eebbb2fd7aae7
    https://github.com/scummvm/scummvm/commit/1d3e5f86f06d4171a885a64f042eebbb2fd7aae7
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-10T07:32:30+02:00

Commit Message:
MADS: Rex - Reduce the scope of some variables in TextView

Changed paths:
    engines/mads/nebular/menu_nebular.cpp



diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 1fbf96d..a85a67d 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -619,7 +619,7 @@ int TextView::getParameter(const char **paramP) {
 }
 
 void TextView::processText() {
-	int lineWidth, xStart;
+	int xStart;
 
 	if (!strcmp(_currentLine, "***")) {
 		// Special signifier for end of script
@@ -643,7 +643,7 @@ void TextView::processText() {
 		strcpy(centerP, p);
 
 	} else {
-		lineWidth = _font->getWidth(_currentLine);
+		int lineWidth = _font->getWidth(_currentLine);
 		xStart = (MADS_SCREEN_WIDTH - lineWidth) / 2;
 	}
 
@@ -951,10 +951,10 @@ void AnimationView::processLines() {
 		return;
 	}
 
-	char c;
 	while (!_script.eos()) {
 		// Get in next line
 		_currentLine.clear();
+		char c;
 		while (!_script.eos() && (c = _script.readByte()) != '\n') {
 			if (c != '\r')
 				_currentLine += c;