Merge remote-tracking branch 'upstream/master' into zvision

Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h

1 files changed, 40 insertions, 40 deletions

diff --git a/engines/saga/console.cpp b/engines/saga/console.cpp
index 771925a321..0b801eef3e 100644
--- a/engines/saga/console.cpp
+++ b/engines/saga/console.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -35,15 +35,15 @@ namespace Saga {
 Console::Console(SagaEngine *vm) : GUI::Debugger() {
 	_vm = vm;
 
-	DCmd_Register("continue",			WRAP_METHOD(Console, Cmd_Exit));
+	registerCmd("continue",			WRAP_METHOD(Console, cmdExit));
 
 	// Actor commands
-	DCmd_Register("actor_walk_to",		WRAP_METHOD(Console, cmdActorWalkTo));
+	registerCmd("actor_walk_to",		WRAP_METHOD(Console, cmdActorWalkTo));
 
 	// Animation commands
-	DCmd_Register("anim_info",			WRAP_METHOD(Console, cmdAnimInfo));
-	DCmd_Register("cutaway_info",		WRAP_METHOD(Console, cmdCutawayInfo));
-	DCmd_Register("play_cutaway",		WRAP_METHOD(Console, cmdPlayCutaway));
+	registerCmd("anim_info",			WRAP_METHOD(Console, cmdAnimInfo));
+	registerCmd("cutaway_info",		WRAP_METHOD(Console, cmdCutawayInfo));
+	registerCmd("play_cutaway",		WRAP_METHOD(Console, cmdPlayCutaway));
 
 	// Game stuff
 
@@ -60,28 +60,28 @@ Console::Console(SagaEngine *vm) : GUI::Debugger() {
 #endif
 
 	// Scene commands
-	DCmd_Register("current_scene",		WRAP_METHOD(Console, cmdCurrentScene));
-	DCmd_Register("current_chapter",	WRAP_METHOD(Console, cmdCurrentChapter));
-	DCmd_Register("scene_change",		WRAP_METHOD(Console, cmdSceneChange));
-	DCmd_Register("chapter_change",		WRAP_METHOD(Console, cmdChapterChange));
+	registerCmd("current_scene",		WRAP_METHOD(Console, cmdCurrentScene));
+	registerCmd("current_chapter",	WRAP_METHOD(Console, cmdCurrentChapter));
+	registerCmd("scene_change",		WRAP_METHOD(Console, cmdSceneChange));
+	registerCmd("chapter_change",		WRAP_METHOD(Console, cmdChapterChange));
 
-	DCmd_Register("action_map_info",	WRAP_METHOD(Console, cmdActionMapInfo));
-	DCmd_Register("object_map_info",	WRAP_METHOD(Console, cmdObjectMapInfo));
+	registerCmd("action_map_info",	WRAP_METHOD(Console, cmdActionMapInfo));
+	registerCmd("object_map_info",	WRAP_METHOD(Console, cmdObjectMapInfo));
 
 	// Script commands
-	DCmd_Register("wake_up_threads",	WRAP_METHOD(Console, cmdWakeUpThreads));
+	registerCmd("wake_up_threads",	WRAP_METHOD(Console, cmdWakeUpThreads));
 
 	// Panel commands
-	DCmd_Register("current_panel_mode",	WRAP_METHOD(Console, cmdCurrentPanelMode));
-	DCmd_Register("set_panel_mode",		WRAP_METHOD(Console, cmdSetPanelMode));
+	registerCmd("current_panel_mode",	WRAP_METHOD(Console, cmdCurrentPanelMode));
+	registerCmd("set_panel_mode",		WRAP_METHOD(Console, cmdSetPanelMode));
 
 	// Font commands
-	DCmd_Register("set_font_mapping",	WRAP_METHOD(Console, cmdSetFontMapping));
+	registerCmd("set_font_mapping",	WRAP_METHOD(Console, cmdSetFontMapping));
 
 	// Global flags commands
-	DCmd_Register("global_flags_info",	WRAP_METHOD(Console, cmdGlobalFlagsInfo));
-	DCmd_Register("set_global_flag",	WRAP_METHOD(Console, cmdSetGlobalFlag));
-	DCmd_Register("clear_global_flag",	WRAP_METHOD(Console, cmdClearGlobalFlag));
+	registerCmd("global_flags_info",	WRAP_METHOD(Console, cmdGlobalFlagsInfo));
+	registerCmd("set_global_flag",	WRAP_METHOD(Console, cmdSetGlobalFlag));
+	registerCmd("clear_global_flag",	WRAP_METHOD(Console, cmdClearGlobalFlag));
 }
 
 Console::~Console() {
@@ -89,7 +89,7 @@ Console::~Console() {
 
 bool Console::cmdActorWalkTo(int argc, const char **argv) {
 	if (argc != 4)
-		DebugPrintf("Usage: %s <Actor id> <lx> <ly>\n", argv[0]);
+		debugPrintf("Usage: %s <Actor id> <lx> <ly>\n", argv[0]);
 	else
 		_vm->_actor->cmdActorWalkTo(argc, argv);
 	return true;
@@ -110,7 +110,7 @@ bool Console::cmdCutawayInfo(int argc, const char **argv) {
 bool Console::cmdPlayCutaway(int argc, const char **argv) {
 #ifdef ENABLE_IHNM
 	if (argc != 2)
-		DebugPrintf("Usage: %s <Cutaway number>\n", argv[0]);
+		debugPrintf("Usage: %s <Cutaway number>\n", argv[0]);
 	else
 		_vm->_anim->playCutaway(atoi(argv[1]), false);
 #endif
@@ -118,19 +118,19 @@ bool Console::cmdPlayCutaway(int argc, const char **argv) {
 }
 
 bool Console::cmdCurrentScene(int argc, const char **argv) {
-	DebugPrintf("Current Scene is: %i, scene resource id: %i\n",
+	debugPrintf("Current Scene is: %i, scene resource id: %i\n",
 		_vm->_scene->currentSceneNumber(), _vm->_scene->currentSceneResourceId());
 	return true;
 }
 
 bool Console::cmdCurrentChapter(int argc, const char **argv) {
-	DebugPrintf("Current Chapter is: %i\n", _vm->_scene->currentChapterNumber());
+	debugPrintf("Current Chapter is: %i\n", _vm->_scene->currentChapterNumber());
 	return true;
 }
 
 bool Console::cmdSceneChange(int argc, const char **argv) {
 	if (argc != 2)
-		DebugPrintf("Usage: %s <Scene number>\n", argv[0]);
+		debugPrintf("Usage: %s <Scene number>\n", argv[0]);
 	else
 		_vm->_scene->cmdSceneChange(argc, argv);
 	return true;
@@ -138,7 +138,7 @@ bool Console::cmdSceneChange(int argc, const char **argv) {
 
 bool Console::cmdChapterChange(int argc, const char **argv) {
 	if (argc != 3)
-		DebugPrintf("Usage: %s <Chapter number> <Scene number>\n", argv[0]);
+		debugPrintf("Usage: %s <Chapter number> <Scene number>\n", argv[0]);
 	else {
 		_vm->_scene->setChapterNumber(atoi(argv[2]));
 		_vm->_scene->cmdSceneChange(argc, argv);
@@ -158,9 +158,9 @@ bool Console::cmdObjectMapInfo(int argc, const char **argv) {
 
 bool Console::cmdWakeUpThreads(int argc, const char **argv) {
 	if (argc != 2) {
-		DebugPrintf("Usage: %s <wait type>\n", argv[0]);
-		DebugPrintf("e.g.: 1 for kWaitTypeDelay, 2 for kWaitTypeSpeech, 10 for kWaitTypeWaitFrames");
-		DebugPrintf("Refer to saga/script.h for additional types");
+		debugPrintf("Usage: %s <wait type>\n", argv[0]);
+		debugPrintf("e.g.: 1 for kWaitTypeDelay, 2 for kWaitTypeSpeech, 10 for kWaitTypeWaitFrames");
+		debugPrintf("Refer to saga/script.h for additional types");
 	} else {
 		_vm->_script->wakeUpThreads(atoi(argv[1]));
 	}
@@ -168,13 +168,13 @@ bool Console::cmdWakeUpThreads(int argc, const char **argv) {
 }
 
 bool Console::cmdCurrentPanelMode(int argc, const char **argv) {
-	DebugPrintf("Current Panel Mode is: %i\n", _vm->_interface->getMode());
+	debugPrintf("Current Panel Mode is: %i\n", _vm->_interface->getMode());
 	return true;
 }
 
 bool Console::cmdSetPanelMode(int argc, const char **argv) {
 	if (argc != 2)
-		DebugPrintf("Usage: %s <Panel mode number>\n", argv[0]);
+		debugPrintf("Usage: %s <Panel mode number>\n", argv[0]);
 	else
 		_vm->_interface->setMode(atoi(argv[1]));
 	return true;
@@ -182,8 +182,8 @@ bool Console::cmdSetPanelMode(int argc, const char **argv) {
 
 bool Console::cmdSetFontMapping(int argc, const char **argv) {
 	if (argc != 2) {
-		DebugPrintf("Sets font mapping\nUsage: %s <Font mapping flag>\n", argv[0]);
-		DebugPrintf("Mapping flags:\n0 - default game behavior\n1 - force font mapping\n2 - ignore font mapping\n");
+		debugPrintf("Sets font mapping\nUsage: %s <Font mapping flag>\n", argv[0]);
+		debugPrintf("Mapping flags:\n0 - default game behavior\n1 - force font mapping\n2 - ignore font mapping\n");
 	} else {
 		_vm->_font->setFontMapping(atoi(argv[1]));
 	}
@@ -191,7 +191,7 @@ bool Console::cmdSetFontMapping(int argc, const char **argv) {
 }
 
 bool Console::cmdGlobalFlagsInfo(int argc, const char **argv) {
-	DebugPrintf("Global flags status for IHNM:\n");
+	debugPrintf("Global flags status for IHNM:\n");
 
 	// Global flags in IHNM:
 	// 00: Tested when Gorrister's chapter ends. 0: Gorrister failed, 1: Gorrister won
@@ -232,9 +232,9 @@ bool Console::cmdGlobalFlagsInfo(int argc, const char **argv) {
 	for (i = 0; i < 32; i += 8) {
 		for (k = i; k < i + 8; k ++) {
 			flagStatus = _vm->_globalFlags & (1 << k) ? 1 : 0;
-			_vm->_console->DebugPrintf("%02d: %u |", k, flagStatus);
+			_vm->_console->debugPrintf("%02d: %u |", k, flagStatus);
 		}
-		_vm->_console->DebugPrintf("\n");
+		_vm->_console->debugPrintf("\n");
 	}
 
 	return true;
@@ -242,13 +242,13 @@ bool Console::cmdGlobalFlagsInfo(int argc, const char **argv) {
 
 bool Console::cmdSetGlobalFlag(int argc, const char **argv) {
 	if (argc != 2) {
-		DebugPrintf("Usage: %s <Global flag number>\nValid flag numbers are 0 - 31\n", argv[0]);
+		debugPrintf("Usage: %s <Global flag number>\nValid flag numbers are 0 - 31\n", argv[0]);
 	} else {
 		int flagNumber = atoi(argv[1]);
 		if (flagNumber >= 0 && flagNumber <= 31) {
 			_vm->_globalFlags |= (1 << flagNumber);
 		} else {
-			DebugPrintf("Valid flag numbers are 0 - 31\n");
+			debugPrintf("Valid flag numbers are 0 - 31\n");
 		}
 	}
 	return true;
@@ -256,13 +256,13 @@ bool Console::cmdSetGlobalFlag(int argc, const char **argv) {
 
 bool Console::cmdClearGlobalFlag(int argc, const char **argv) {
 	if (argc != 2) {
-		DebugPrintf("Usage: %s <Global flag number>\nValid flag numbers are 0 - 31\n", argv[0]);
+		debugPrintf("Usage: %s <Global flag number>\nValid flag numbers are 0 - 31\n", argv[0]);
 	} else {
 		int flagNumber = atoi(argv[1]);
 		if (flagNumber >= 0 && flagNumber <= 31) {
 			_vm->_globalFlags &= ~(1 << flagNumber);
 		} else {
-			DebugPrintf("Valid flag numbers are 0 - 31\n");
+			debugPrintf("Valid flag numbers are 0 - 31\n");
 		}
 	}
 	return true;