libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-05 00:01:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented the read resource index as the first virtual fonction...

Browse Source 
svn-id: r3803
This commit is contained in:
Vincent Hamm 2002-03-23 22:03:35 +00:00
parent ccf69ad76b
commit e63a818d21
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource.cpp
View File

@ -322,7 +322,7 @@ void Scumm::readIndexFile() {
openRoom(-1); openRoom(-1);
} }
void Scumm::readIndexFileSmall() { void Scumm_v3::readIndexFile() {
uint16 blocktype; uint16 blocktype;
uint32 itemsize; uint32 itemsize;
int numblock = 0; int numblock = 0;

10
scumm.h
View File

@ -810,8 +810,7 @@ public:
void loadRoomObjectsSmall(); void loadRoomObjectsSmall();
void readArrayFromIndexFile(); void readArrayFromIndexFile();
void readMAXS(); void readMAXS();
void readIndexFile(); virtual void readIndexFile();
void readIndexFileSmall();
void loadCharset(int i); void loadCharset(int i);
void nukeCharset(int i); void nukeCharset(int i);
@ -1663,22 +1662,17 @@ public:
byte VAR_CHARSET_MASK; byte VAR_CHARSET_MASK;
void launch(); void launch();
virtual void test1() const { return; };
}; };
class Scumm_v7 : public Scumm class Scumm_v7 : public Scumm
{ {
public: public:
// Scumm_v7();
// const static int test = 1;
void test1v7() const { printf("Test1"); }
void test1() const { test1v7(); }
}; };
class Scumm_v3 : public Scumm class Scumm_v3 : public Scumm
{ {
public: public:
void readIndexFile();
}; };
struct ScummDebugger { struct ScummDebugger {

3
scummvm.cpp
View File

@ -1051,9 +1051,6 @@ void Scumm::launch()
if (_gameId==GID_MONKEY2 && _bootParam == 0) if (_gameId==GID_MONKEY2 && _bootParam == 0)
_bootParam = 10001; _bootParam = 10001;
if (_features & GF_SMALL_HEADER)
readIndexFileSmall();
else
readIndexFile(); readIndexFile();
initRandSeeds(); initRandSeeds();

7
sdl.cpp
View File

@ -920,6 +920,13 @@ int main(int argc, char* argv[]) {
detecter.detectMain(argc, argv); detecter.detectMain(argc, argv);
if( detecter._features & GF_AFTER_V7 ) // not final implementation. This is just a test
scumm = new Scumm_v7;
else
if( detecter._features & GF_OLD256 )
scumm = new Scumm_v3;
else
scumm = new Scumm; scumm = new Scumm;
scumm->_fullScreen = detecter._fullScreen; scumm->_fullScreen = detecter._fullScreen;