[Scummvm-cvs-logs] SF.net SVN: scummvm: [25056] scummvm/trunk/engines/touche

[cyx at users.sourceforge.net]

Revision: 25056
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25056&view=rev
Author:   cyx
Date:     2007-01-08 04:39:31 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
renamed an opcode, fixed an assert condition

Modified Paths:
--------------
    scummvm/trunk/engines/touche/opcodes.cpp
    scummvm/trunk/engines/touche/resource.cpp
    scummvm/trunk/engines/touche/touche.h

Modified: scummvm/trunk/engines/touche/opcodes.cpp
===================================================================
--- scummvm/trunk/engines/touche/opcodes.cpp	2007-01-08 12:37:19 UTC (rev 25055)
+++ scummvm/trunk/engines/touche/opcodes.cpp	2007-01-08 12:39:31 UTC (rev 25056)
@@ -90,7 +90,7 @@
 		&ToucheEngine::op_getKeyCharWalkBox,
 		&ToucheEngine::op_startSound,
 		/* 0x30 */
-		&ToucheEngine::op_initKeyCharTalk,
+		&ToucheEngine::op_moveKeyCharToPos,
 		0,
 		0,
 		0,
@@ -443,8 +443,8 @@
 	_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;

Modified: scummvm/trunk/engines/touche/resource.cpp
===================================================================
--- scummvm/trunk/engines/touche/resource.cpp	2007-01-08 12:37:19 UTC (rev 25055)
+++ scummvm/trunk/engines/touche/resource.cpp	2007-01-08 12:39:31 UTC (rev 25056)
@@ -240,7 +240,7 @@
 	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);
 }
 

Modified: scummvm/trunk/engines/touche/touche.h
===================================================================
--- scummvm/trunk/engines/touche/touche.h	2007-01-08 12:37:19 UTC (rev 25055)
+++ scummvm/trunk/engines/touche/touche.h	2007-01-08 12:39:31 UTC (rev 25056)
@@ -516,7 +516,7 @@
 	void op_fetchScriptByte();
 	void op_getKeyCharWalkBox();
 	void op_startSound();
-	void op_initKeyCharTalk();
+	void op_moveKeyCharToPos();
 	void op_loadRoom();
 	void op_updateRoom();
 	void op_startTalk();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.