[Scummvm-cvs-logs] SF.net SVN: scummvm:[54906] tools/trunk/engines/scumm/descumm.cpp

[fingolfin at users.sourceforge.net]

Revision: 54906
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54906&view=rev
Author:   fingolfin
Date:     2010-12-14 13:17:27 +0000 (Tue, 14 Dec 2010)

Log Message:
-----------
TOOLS: descumm semicolon cleanup from patch #3049421

Modified Paths:
--------------
    tools/trunk/engines/scumm/descumm.cpp

Modified: tools/trunk/engines/scumm/descumm.cpp
===================================================================
--- tools/trunk/engines/scumm/descumm.cpp	2010-12-14 06:42:00 UTC (rev 54905)
+++ tools/trunk/engines/scumm/descumm.cpp	2010-12-14 13:17:27 UTC (rev 54906)
@@ -681,7 +681,7 @@
 	} else {
 		if (!(args & ANOLASTPAREN)) {
 		buf = strecpy(buf, ")");
-	}
+		}
 		if (!(args & ANOENDSEMICOLON) && buf[(strlen(buf) - 1)] != ';') {
 			buf = strecpy(buf, ";");
 		}
@@ -1934,10 +1934,10 @@
 	case 0xF9:{
 			buf = strecpy(buf, "doSentence(");
 			if (!(opcode & 0x80) && *g_scriptCurPos == 0xFC) {
-				strcpy(buf, "STOP)");
+				strcpy(buf, "STOP);");
 				g_scriptCurPos++;
 			} else if (!(opcode & 0x80) && *g_scriptCurPos == 0xFB) {
-				strcpy(buf, "RESET)");
+				strcpy(buf, "RESET);");
 				g_scriptCurPos++;
 			} else {
 				do_tok(buf, "",
@@ -2313,7 +2313,7 @@
 			int i;
 			char first = 1;
 
-			buf = do_tok(buf, "setVarRange", A1V | ANOLASTPAREN);
+			buf = do_tok(buf, "setVarRange", A1V | ANOLASTPAREN | ANOENDSEMICOLON);
 			i = get_byte();
 
 			buf += sprintf(buf, ",%d,[", i);
@@ -3284,7 +3284,7 @@
 			buf = strecpy(buf, "doSentence(");
 			// FIXME: this is not exactly what ScummVM does...
 			if (!(opcode & 0x80) && (*g_scriptCurPos == 0xFE)) {
-				strcpy(buf, "STOP)");
+				strcpy(buf, "STOP);");
 				g_scriptCurPos++;
 			} else {
 				do_tok(buf, "",
@@ -3367,7 +3367,7 @@
 	case 0xFF:
 		buf =
 			do_tok(buf, "drawBox",
-						 ((opcode & 0x80) ? A1V : A1W) | ((opcode & 0x40) ? A2V : A2W) | ANOLASTPAREN);
+						 ((opcode & 0x80) ? A1V : A1W) | ((opcode & 0x40) ? A2V : A2W) | ANOLASTPAREN | ANOENDSEMICOLON);
 		opcode = get_byte();
 		do_tok(buf, NULL,
 					 ASTARTCOMMA | ANOFIRSTPAREN | ((opcode & 0x80) ? A1V : A1W) |
@@ -3510,7 +3510,7 @@
 			int i;
 			char first = 1;
 
-			buf = do_tok(buf, "setVarRange", A1V | ANOLASTPAREN);
+			buf = do_tok(buf, "setVarRange", A1V | ANOLASTPAREN | ANOENDSEMICOLON);
 			i = get_byte();
 
 			buf += sprintf(buf, ",%d,[", i);


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