[Scummvm-cvs-logs] SF.net SVN: scummvm: [28905] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 28905
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28905&view=rev
Author:   peres001
Date:     2007-09-15 05:16:43 -0700 (Sat, 15 Sep 2007)

Log Message:
-----------
Fixed BRA parser table for scripts.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_br.cpp
    scummvm/trunk/engines/parallaction/exec_ns.cpp
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/parser_br.cpp
    scummvm/trunk/engines/parallaction/parser_ns.cpp
    scummvm/trunk/engines/parallaction/staticres.cpp

Modified: scummvm/trunk/engines/parallaction/exec_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_br.cpp	2007-09-15 12:09:56 UTC (rev 28904)
+++ scummvm/trunk/engines/parallaction/exec_br.cpp	2007-09-15 12:16:43 UTC (rev 28905)
@@ -29,14 +29,15 @@
 #define INST_TEXT		23
 #define INST_MUL		24
 #define INST_DIV		25
-#define INST_IF			26
-#define INST_IFEQ		27
-#define INST_IFLT		28
-#define INST_IFGT		29
-#define INST_ENDIF		30
-#define INST_STOP		31
+#define INST_IFEQ		26
+#define INST_IFLT		27
+#define INST_IFGT		28
+#define INST_ENDIF		29
+#define INST_STOP		30
+#define INST_ENDSCRIPT	31
 
 
+
 typedef OpcodeImpl<Parallaction_br> OpcodeV2;
 #define COMMAND_OPCODE(op) OpcodeV2(this, &Parallaction_br::cmdOp_##op)
 #define DECLARE_COMMAND_OPCODE(op) void Parallaction_br::cmdOp_##op()
@@ -411,12 +412,18 @@
 
 	if (_subtitle0._old.x != -1000) {
 		_subtitle0.getRect(r);
+
+//		printf("sub0: (%i, %i, %i, %i)\n", r.left, r.top, r.right, r.bottom);
+
 		_gfx->restoreBackground(r);
 	}
 	_subtitle0._old = _subtitle0._pos;
 
 	if (_subtitle1._old.x != -1000) {
 		_subtitle0.getRect(r);
+
+//		printf("sub1: (%i, %i, %i, %i)\n", r.left, r.top, r.right, r.bottom);
+
 		_gfx->restoreBackground(r);
 	}
 	_subtitle1._old = _subtitle1._pos;

Modified: scummvm/trunk/engines/parallaction/exec_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_ns.cpp	2007-09-15 12:09:56 UTC (rev 28904)
+++ scummvm/trunk/engines/parallaction/exec_ns.cpp	2007-09-15 12:16:43 UTC (rev 28905)
@@ -48,7 +48,7 @@
 #define INST_START						16
 #define INST_SOUND						17
 #define INST_MOVE						18
-#define INST_END						19
+#define INST_ENDSCRIPT					19
 
 
 typedef OpcodeImpl<Parallaction_ns> OpcodeV1;
@@ -185,7 +185,7 @@
 	_engineFlags |= kEngineWalking;
 }
 
-DECLARE_INSTRUCTION_OPCODE(end) {
+DECLARE_INSTRUCTION_OPCODE(endscript) {
 	if ((_instRunCtxt.a->_flags & kFlagsLooping) == 0) {
 		_instRunCtxt.a->_flags &= ~kFlagsActing;
 		runCommands(_instRunCtxt.a->_commands, _instRunCtxt.a);
@@ -819,7 +819,7 @@
 		INSTRUCTION_OPCODE(start),
 		INSTRUCTION_OPCODE(sound),
 		INSTRUCTION_OPCODE(move),
-		INSTRUCTION_OPCODE(end)
+		INSTRUCTION_OPCODE(endscript)
 	};
 
 	uint i;

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-09-15 12:09:56 UTC (rev 28904)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-09-15 12:16:43 UTC (rev 28905)
@@ -884,7 +884,7 @@
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(start);
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(sound);
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(move);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(end);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endscript);
 
 };
 

Modified: scummvm/trunk/engines/parallaction/parser_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_br.cpp	2007-09-15 12:09:56 UTC (rev 28904)
+++ scummvm/trunk/engines/parallaction/parser_br.cpp	2007-09-15 12:16:43 UTC (rev 28905)
@@ -704,6 +704,8 @@
 		INSTRUCTION_PARSER(inc),		// mul
 		INSTRUCTION_PARSER(inc),		// div
 		INSTRUCTION_PARSER(if_op),
+		INSTRUCTION_PARSER(null),
+		INSTRUCTION_PARSER(null),
 		INSTRUCTION_PARSER(endif),
 		INSTRUCTION_PARSER(zone),		// stop
 		INSTRUCTION_PARSER(endscript)

Modified: scummvm/trunk/engines/parallaction/parser_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_ns.cpp	2007-09-15 12:09:56 UTC (rev 28904)
+++ scummvm/trunk/engines/parallaction/parser_ns.cpp	2007-09-15 12:16:43 UTC (rev 28905)
@@ -871,7 +871,7 @@
     debugC(5, kDebugLocation, "parseLocation('%s')", filename);
 
 	allocateLocationSlot(filename);
-	printf("got location slot #%i for %s\n", _currentLocationIndex, filename);
+//	printf("got location slot #%i for %s\n", _currentLocationIndex, filename);
 
 	Script *script = _disk->loadLocation(filename);
 

Modified: scummvm/trunk/engines/parallaction/staticres.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/staticres.cpp	2007-09-15 12:09:56 UTC (rev 28904)
+++ scummvm/trunk/engines/parallaction/staticres.cpp	2007-09-15 12:16:43 UTC (rev 28905)
@@ -421,6 +421,8 @@
 	"mul",
 	"div",
 	"if",
+	"dummy",
+	"dummy",
 	"endif",
 	"stop",
 	"endscript"


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