From 53d842f37700a4e7bb5dd8f7327f4b4b68d9174b Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Mon, 8 Jan 2007 12:39:31 +0000
Subject: renamed an opcode, fixed an assert condition

svn-id: r25056
---
 engines/touche/opcodes.cpp  | 6 +++---
 engines/touche/resource.cpp | 2 +-
 engines/touche/touche.h     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/touche')

diff --git a/engines/touche/opcodes.cpp b/engines/touche/opcodes.cpp
index 2011384348..c5f2e5afd9 100644
--- a/engines/touche/opcodes.cpp
+++ b/engines/touche/opcodes.cpp
@@ -90,7 +90,7 @@ void ToucheEngine::setupOpcodes() {
 		&ToucheEngine::op_getKeyCharWalkBox,
 		&ToucheEngine::op_startSound,
 		/* 0x30 */
-		&ToucheEngine::op_initKeyCharTalk,
+		&ToucheEngine::op_moveKeyCharToPos,
 		0,
 		0,
 		0,
@@ -443,8 +443,8 @@ void ToucheEngine::op_startSound() {
 	_newSoundPriority = 1;
 }
 
-void ToucheEngine::op_initKeyCharTalk() {
-	debugC(9, kDebugOpcodes, "ToucheEngine::op_initKeyCharTalk()");
+void ToucheEngine::op_moveKeyCharToPos() {
+	debugC(9, kDebugOpcodes, "ToucheEngine::op_moveKeyCharToPos()");
 	int16 keyChar = _script.readNextWord();
 	if (keyChar == 256) {
 		keyChar = _currentKeyCharNum;
diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp
index bd96793259..db5f7a4d3e 100644
--- a/engines/touche/resource.cpp
+++ b/engines/touche/resource.cpp
@@ -240,7 +240,7 @@ void ToucheEngine::res_loadProgram(int num) {
 	debugC(9, kDebugResource, "ToucheEngine::res_loadProgram() num=%d", num);
 	const uint32 offs = res_getDataOffset(kResourceTypeProgram, num, &_programDataSize);
 	_fData.seek(offs);
-	assert(_programDataSize < kMaxProgramDataSize);
+	assert(_programDataSize <= kMaxProgramDataSize);
 	_fData.read(_programData, _programDataSize);
 }
 
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index 546c5286b0..afeca2f025 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -516,7 +516,7 @@ protected:
 	void op_fetchScriptByte();
 	void op_getKeyCharWalkBox();
 	void op_startSound();
-	void op_initKeyCharTalk();
+	void op_moveKeyCharToPos();
 	void op_loadRoom();
 	void op_updateRoom();
 	void op_startTalk();
-- 
cgit v1.2.3