WAGE: Fix command processing

scummvm · Jan 4, 2016 · 2ec86f1 · 2ec86f1
1 parent ba34243
commit 2ec86f1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
@@ -85,6 +85,10 @@ bool Script::execute(World *world, int loopCount, String *inputText, Designed *i
 	_inputClick = inputClick;
 	_callbacks = callbacks;
 	_handled = false;
+	Common::String input;
+
+	if (inputText)
+		input = *inputText;
 
 	_data->seek(12);
 	while (_data->pos() < _data->size()) {
@@ -150,11 +154,10 @@ bool Script::execute(World *world, int loopCount, String *inputText, Designed *i
 
 	if (_world->_globalScript != this) {
 		debug(1, "Executing global script...");
-		bool globalHandled = _world->_globalScript->execute(_world, _loopCount, _inputText, _inputClick, _callbacks);
+		bool globalHandled = _world->_globalScript->execute(_world, _loopCount, &input, _inputClick, _callbacks);
 		if (globalHandled)
 			_handled = true;
-	} else if (inputText != NULL) {
-		Common::String input(*inputText);
+	} else if (!input.empty()) {
 		input.toLowercase();
 		if (input.equals("n") || input.contains("north")) {
 			handleMoveCommand(Scene::NORTH, "north");