[Scummvm-cvs-logs] SF.net SVN: scummvm: [21979] scummvm/trunk/engines/scumm/he

[fingolfin at users.sourceforge.net]

Revision: 21979
Author:   fingolfin
Date:     2006-04-17 07:32:46 -0700 (Mon, 17 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21979&view=rev

Log Message:
-----------
Replaced o70_seekFilePos by o60_seekFilePos (both were identical)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/intern_he.h
    scummvm/trunk/engines/scumm/he/script_v100he.cpp
    scummvm/trunk/engines/scumm/he/script_v70he.cpp
    scummvm/trunk/engines/scumm/he/script_v72he.cpp
    scummvm/trunk/engines/scumm/he/script_v80he.cpp
    scummvm/trunk/engines/scumm/he/script_v90he.cpp
Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h	2006-04-17 13:48:44 UTC (rev 21978)
+++ scummvm/trunk/engines/scumm/he/intern_he.h	2006-04-17 14:32:46 UTC (rev 21979)
@@ -159,7 +159,6 @@
 	void o70_resourceRoutines();
 	void o70_systemOps();
 	void o70_kernelSetFunctions();
-	void o70_seekFilePos();
 	void o70_copyString();
 	void o70_getStringWidth();
 	void o70_getStringLen();

Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp	2006-04-17 13:48:44 UTC (rev 21978)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp	2006-04-17 14:32:46 UTC (rev 21979)
@@ -180,7 +180,7 @@
 		/* 6C */
 		OPCODE(o72_talkEgo),
 		OPCODE(o6_invalid),
-		OPCODE(o70_seekFilePos),
+		OPCODE(o60_seekFilePos),
 		OPCODE(o6_setBoxFlags),
 		/* 70 */
 		OPCODE(o6_invalid),

Modified: scummvm/trunk/engines/scumm/he/script_v70he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v70he.cpp	2006-04-17 13:48:44 UTC (rev 21978)
+++ scummvm/trunk/engines/scumm/he/script_v70he.cpp	2006-04-17 14:32:46 UTC (rev 21979)
@@ -334,7 +334,7 @@
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o70_seekFilePos),
+		OPCODE(o60_seekFilePos),
 		OPCODE(o60_redimArray),
 		OPCODE(o60_readFilePos),
 		/* EC */
@@ -714,30 +714,6 @@
 	}
 }
 
-void ScummEngine_v70he::o70_seekFilePos() {
-	int mode, offset, slot;
-	mode = pop();
-	offset = pop();
-	slot = pop();
-
-	if (slot == -1)
-		return;
-
-	switch (mode) {
-	case 1:
-		_hFileTable[slot].seek(offset, SEEK_SET);
-		break;
-	case 2:
-		_hFileTable[slot].seek(offset, SEEK_CUR);
-		break;
-	case 3:
-		_hFileTable[slot].seek(offset, SEEK_END);
-		break;
-	default:
-		error("o70_seekFilePos: default case 0x%x", mode);
-	}
-}
-
 void ScummEngine_v70he::o70_copyString() {
 	int dst, size;
 	int src = pop();

Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp	2006-04-17 13:48:44 UTC (rev 21978)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp	2006-04-17 14:32:46 UTC (rev 21979)
@@ -337,7 +337,7 @@
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o70_seekFilePos),
+		OPCODE(o60_seekFilePos),
 		OPCODE(o72_redimArray),
 		OPCODE(o60_readFilePos),
 		/* EC */

Modified: scummvm/trunk/engines/scumm/he/script_v80he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v80he.cpp	2006-04-17 13:48:44 UTC (rev 21978)
+++ scummvm/trunk/engines/scumm/he/script_v80he.cpp	2006-04-17 14:32:46 UTC (rev 21979)
@@ -334,7 +334,7 @@
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o70_seekFilePos),
+		OPCODE(o60_seekFilePos),
 		OPCODE(o72_redimArray),
 		OPCODE(o60_readFilePos),
 		/* EC */

Modified: scummvm/trunk/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v90he.cpp	2006-04-17 13:48:44 UTC (rev 21978)
+++ scummvm/trunk/engines/scumm/he/script_v90he.cpp	2006-04-17 14:32:46 UTC (rev 21979)
@@ -333,7 +333,7 @@
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o70_seekFilePos),
+		OPCODE(o60_seekFilePos),
 		OPCODE(o72_redimArray),
 		OPCODE(o60_readFilePos),
 		/* EC */


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