[Scummvm-cvs-logs] CVS: scummvm gameDetecter.cpp,1.2,1.3 gameDetecter.h,1.2,1.3 scumm.h,1.100,1.101 sdl.cpp,1.58,1.59

[Vincent Hamm]

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

Modified Files:
	gameDetecter.cpp gameDetecter.h scumm.h sdl.cpp 
Log Message:
Created all the child scumm class. The good one is now selected according to the game database. Now we need to move all the specific stuff to the child class

Index: gameDetecter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetecter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gameDetecter.cpp	25 Mar 2002 00:45:07 -0000	1.2
--- gameDetecter.cpp	25 Mar 2002 01:40:51 -0000	1.3
***************
*** 192,195 ****
--- 192,196 ----
                  if (!scumm_stricmp(_exe_name, gnl->filename)) {
                          _gameId = gnl->id;
+ 			_scummVersion = gnl->major;
  //                      _majorScummVersion = gnl->major;
  //                      _middleScummVersion = gnl->middle;

Index: gameDetecter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetecter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gameDetecter.h	25 Mar 2002 00:45:08 -0000	1.2
--- gameDetecter.h	25 Mar 2002 01:40:51 -0000	1.3
***************
*** 22,24 ****
--- 22,26 ----
  	uint16 _soundCardType;
  
+ 	int _scummVersion;
+ 
  };

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** scumm.h	23 Mar 2002 22:03:35 -0000	1.100
--- scumm.h	25 Mar 2002 01:40:51 -0000	1.101
***************
*** 1665,1677 ****
  };
  
! class Scumm_v7 : public Scumm
  {
  public:
  };
  
! class Scumm_v3 : public Scumm
  {
- public:
- 	void readIndexFile();
  };
  
--- 1665,1688 ----
  };
  
! class Scumm_v3 : public Scumm
  {
  public:
+ 	void readIndexFile();
  };
  
! class Scumm_v4 : public Scumm_v3
! {
! };
! 
! class Scumm_v5 : public Scumm
! {
! };
! 
! class Scumm_v6 : public Scumm
! {
! };
! 
! class Scumm_v7 : public Scumm
  {
  };
  

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** sdl.cpp	25 Mar 2002 00:45:09 -0000	1.58
--- sdl.cpp	25 Mar 2002 01:40:51 -0000	1.59
***************
*** 926,938 ****
  		return(-1);
  
! 	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;
! 
  
  /* All those stuff should be moved to the constructor.... */
--- 926,951 ----
  		return(-1);
  
! 	switch(detecter._scummVersion)
! 	{
! 		case 3:
! 			scumm = new Scumm_v3;
! 			break;
! 		case 4:
! 			scumm = new Scumm_v4;
! 			break;
! 		case 5:
! 			scumm = new Scumm_v5;
! 			break;
! 		case 6:
! 			scumm = new Scumm_v6;
! 			break;
! 		case 7:
! 			scumm = new Scumm_v7;
! 			break;
! 		default: // do we really need a default ?
! 			scumm = new Scumm;
! 			break;
! 	}
! 		
  
  /* All those stuff should be moved to the constructor.... */