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

[kirben at users.sourceforge.net]

Revision: 20969
Author:   kirben
Date:     2006-02-27 23:09:46 -0800 (Mon, 27 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20969&view=rev

Log Message:
-----------
Remove unused cases in do_room_ops_old, only cases 1 - 7 exist in SCUMM4 and earlier games

Modified Paths:
--------------
    tools/trunk/descumm.cpp
Modified: tools/trunk/descumm.cpp
===================================================================
--- tools/trunk/descumm.cpp	2006-02-28 07:00:48 UTC (rev 20968)
+++ tools/trunk/descumm.cpp	2006-02-28 07:09:46 UTC (rev 20969)
@@ -1261,7 +1261,6 @@
 
 void do_room_ops_old(char *buf, byte master_opcode)
 {
-	/* FIXME - this function is not complete yet! */
 	char	a[256];
 	char	b[256];
 	
@@ -1328,70 +1327,9 @@
 	case 0x06:
 		do_tok(buf, "ShakeOff", 0);
 		break;
-/*
 	case 0x07:
 		do_tok(buf, "Unused", 0);
 		break;
-	case 0x08:
-		buf =
-			do_tok(buf, "roomFunc2",
-						 ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B) |
-						 ((opcode & 0x20) ? A3V : A3B));
-		break;
-	case 0x09:
-		buf = do_tok(buf, "saveLoad?", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
-		break;
-	case 0x0A:
-		buf = do_tok(buf, "screenEffect?", ((opcode & 0x80) ? A1V : A1W));
-		break;
-	case 0x0B:
-		buf =
-			do_tok(buf, "roomFunc2",
-						 ANOLASTPAREN | ((opcode & 0x80) ? A1V : A1W) | ((opcode & 0x40) ?
-																														 A2V : A2W) |
-						 ((opcode & 0x20) ? A3V : A3W));
-		opcode = get_byte();
-		buf =
-			do_tok(buf, NULL,
-						 ASTARTCOMMA | ANOFIRSTPAREN | ((opcode & 0x80) ? A1V : A1B) |
-						 ((opcode & 0x40) ? A2V : A2B));
-		break;
-
-	case 0x0C:
-		buf =
-			do_tok(buf, "roomFunc3",
-						 ANOLASTPAREN | ((opcode & 0x80) ? A1V : A1W) | ((opcode & 0x40) ?
-																														 A2V : A2W) |
-						 ((opcode & 0x20) ? A3V : A3W));
-		opcode = get_byte();
-		buf =
-			do_tok(buf, NULL,
-						 ASTARTCOMMA | ANOFIRSTPAREN | ((opcode & 0x80) ? A1V : A1B) |
-						 ((opcode & 0x40) ? A2V : A2B));
-		break;
-
-	case 0x0D:
-		do_tok(buf, "save-string", ((opcode & 0x80) ? A1V : A1B) | A2ASCII);
-		break;
-	case 0x0E:
-		do_tok(buf, "load-string", ((opcode & 0x80) ? A1V : A1B) | A2ASCII);
-		break;
-
-	case 0x0F:
-		buf = do_tok(buf, "palManipulate", ANOLASTPAREN | ((opcode & 0x80) ? A1V : A1B));
-		opcode = get_byte();
-		buf =
-			do_tok(buf, NULL,
-						 ASTARTCOMMA | ANOFIRSTPAREN | ANOLASTPAREN | ((opcode & 0x80) ?
-																													 A1V : A1B) |
-						 ((opcode & 0x40) ? A2V : A2B));
-		opcode = get_byte();
-		buf = do_tok(buf, NULL, ASTARTCOMMA | ANOFIRSTPAREN | ((opcode & 0x80) ? A1V : A1B));
-		break;
-*/
-	case 0x10:
-		do_tok(buf, "colorCycleDelay", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
-		break;
 	default:
 		// strcpy(buf, "Unknown??");
 		// printf("UGH, unknown room op %d\n", opcode & 0x1F);