[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.109,2.110 script_v6.cpp,1.189,1.190 scumm.h,1.301,1.302
Max Horn
fingolfin at users.sourceforge.net
Sat Sep 13 07:00:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1832
Modified Files:
intern.h script_v6.cpp scumm.h
Log Message:
since _hFileTable is only used by Scumm_v6, there is no reason to put it into class Scumm
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.109
retrieving revision 2.110
diff -u -d -r2.109 -r2.110
--- intern.h 10 Sep 2003 17:15:44 -0000 2.109
+++ intern.h 13 Sep 2003 13:59:46 -0000 2.110
@@ -317,7 +317,8 @@
};
const OpcodeEntryV6 *_opcodesV6;
-
+
+ File _hFileTable[17];
public:
Scumm_v6(GameDetector *detector, OSystem *syst) : Scumm(detector, syst)
{
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- script_v6.cpp 13 Sep 2003 13:41:44 -0000 1.189
+++ script_v6.cpp 13 Sep 2003 13:59:46 -0000 1.190
@@ -2371,7 +2371,7 @@
b = pop();
a = pop();
- warning("o6_bompWindow(%d, %d, %d, %d)", a, b, c, d);
+ warning("o6_setBlastObjectWindow(%d, %d, %d, %d)", a, b, c, d);
// sub_274EF(a, b, c, d);
}
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- scumm.h 13 Sep 2003 13:41:44 -0000 1.301
+++ scumm.h 13 Sep 2003 13:59:46 -0000 1.302
@@ -559,7 +559,6 @@
/* Should be in Resource class */
File _fileHandle;
uint32 _fileOffset;
- File _hFileTable[17];
int _resourceHeaderSize;
char *_exe_name; // This is the name we use for opening resource files
char *_game_name; // This is the game the user calls it, so use for saving
More information about the Scummvm-git-logs
mailing list