[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.23,2.24 scumm.h,1.372,1.373 scummvm.cpp,2.584,2.585

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20939/scumm

Modified Files:
	script_v6he.cpp scumm.h scummvm.cpp 
Log Message:
o Add GID_FBEARPACK, previously for target fbpack GID_FBEAR was used, but there
  were fbear-specific modifications which didn't apply to it. Hence another GID.
o seekFile and tellFile are enabled


Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- script_v6he.cpp	23 Feb 2004 00:59:34 -0000	2.23
+++ script_v6he.cpp	23 Feb 2004 02:07:56 -0000	2.24
@@ -1137,7 +1137,7 @@
 	offset = pop();
 	slot = pop();
 
-	warning("stub o6_seekFile(%d, %d, %d)", slot, offset, mode);
+	debug(1, "o6_seekFile(%d, %d, %d)", slot, offset, mode);
 
 	switch (mode) {
 	case 1:
@@ -1160,13 +1160,13 @@
 
 	switch (mode) {
 	case 0:
-		// _hFileTable[slot].seek(offset, SEEK_SET);
+		_hFileTable[slot].seek(offset, SEEK_SET);
 		break;
 	case 1:
-		// _hFileTable[slot].seek(offset, SEEK_CUR);
+		_hFileTable[slot].seek(offset, SEEK_CUR);
 		break;
 	case 2:
-		// _hFileTable[slot].seek(offset, SEEK_END);
+		_hFileTable[slot].seek(offset, SEEK_END);
 		break;
 	}
 }
@@ -1174,15 +1174,14 @@
 void ScummEngine_v6he::o6_tellFile() {
 	int slot = pop();
 
-	warning("stub o6_tellFile(%d)", slot);
+	debug(1, "o6_tellFile(%d)", slot);
 
 	if (slot == -1) {
 		push(0);
 		return;
 	}
 
-	// push(_hFileTable[slot].tell());
-	push(0);
+	push(_hFileTable[slot].pos());
 }
 
 void ScummEngine_v6he::o6_redimArray() {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -d -r1.372 -r1.373
--- scumm.h	22 Feb 2004 03:08:14 -0000	1.372
+++ scumm.h	23 Feb 2004 02:07:56 -0000	1.373
@@ -227,7 +227,8 @@
 	GID_PUTTMOON,
 	GID_FBEAR,
 	GID_PJSDEMO,
-	GID_MONKEY_SEGA
+	GID_MONKEY_SEGA,
+	GID_FBEARPACK
 };
 
 #define _baseRooms res.address[rtRoom]

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.584
retrieving revision 2.585
diff -u -d -r2.584 -r2.585
--- scummvm.cpp	22 Feb 2004 03:08:16 -0000	2.584
+++ scummvm.cpp	23 Feb 2004 02:07:56 -0000	2.585
@@ -164,7 +164,7 @@
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	{"funpack", "Putt-Putt's Fun Pack", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"fbpack", "Fatty Bear's Fun Pack", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
+	{"fbpack", "Fatty Bear's Fun Pack", GID_FBEARPACK, 6, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	{"fbear", "Fatty Bear's Birthday Surprise (DOS)", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},