[Scummvm-cvs-logs] CVS: scummvm resource.cpp,1.57,1.58 scumm.h,1.99,1.100 scummvm.cpp,1.93,1.94 sdl.cpp,1.50,1.51

[Vincent Hamm]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv22069

Modified Files:
	resource.cpp scumm.h scummvm.cpp sdl.cpp 
Log Message:
Implemented the read resource index as the first virtual fonction...

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** resource.cpp	20 Mar 2002 17:51:06 -0000	1.57
--- resource.cpp	23 Mar 2002 22:03:35 -0000	1.58
***************
*** 323,327 ****
  }
  
! void Scumm::readIndexFileSmall() {
         uint16 blocktype;
         uint32 itemsize;
--- 323,327 ----
  }
  
! void Scumm_v3::readIndexFile() {
         uint16 blocktype;
         uint32 itemsize;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** scumm.h	23 Mar 2002 20:34:45 -0000	1.99
--- scumm.h	23 Mar 2002 22:03:35 -0000	1.100
***************
*** 811,816 ****
  	void readArrayFromIndexFile();
  	void readMAXS();
!     void readIndexFile();
!     void readIndexFileSmall();
  	void loadCharset(int i);
  	void nukeCharset(int i);
--- 811,815 ----
  	void readArrayFromIndexFile();
  	void readMAXS();
! 	virtual void readIndexFile();
  	void loadCharset(int i);
  	void nukeCharset(int i);
***************
*** 1664,1669 ****
  
  	void launch();
- 
- 	virtual void test1() const { return; };
  };
  
--- 1663,1666 ----
***************
*** 1671,1678 ****
  {
  public:
-   //	Scumm_v7();
- //	const static int test = 1;
- 	void test1v7() const { printf("Test1"); }
- 	void test1() const { test1v7(); }
  };
  
--- 1668,1671 ----
***************
*** 1680,1683 ****
--- 1673,1677 ----
  {
  public:
+ 	void readIndexFile();
  };
  

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** scummvm.cpp	23 Mar 2002 20:34:45 -0000	1.93
--- scummvm.cpp	23 Mar 2002 22:03:35 -0000	1.94
***************
*** 1052,1059 ****
  		_bootParam = 10001;
  	
! 	if (_features & GF_SMALL_HEADER)
! 		readIndexFileSmall();
! 	else
! 		readIndexFile();
  
  	initRandSeeds();
--- 1052,1056 ----
  		_bootParam = 10001;
  	
! 	readIndexFile();
  
  	initRandSeeds();

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** sdl.cpp	23 Mar 2002 20:34:47 -0000	1.50
--- sdl.cpp	23 Mar 2002 22:03:35 -0000	1.51
***************
*** 920,925 ****
  
  	detecter.detectMain(argc, argv);
! 	
! 	scumm = new Scumm;
  
  	scumm->_fullScreen = detecter._fullScreen;
--- 920,932 ----
  
  	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->_fullScreen = detecter._fullScreen;