[Scummvm-cvs-logs] CVS: scummvm Makefile,1.28,1.29 resource.cpp,1.60,1.61 scumm.h,1.101,1.102 sdl.cpp,1.59,1.60

Vincent Hamm yazoo at users.sourceforge.net
Sun Mar 24 18:10:02 CET 2002


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

Modified Files:
	Makefile resource.cpp scumm.h sdl.cpp 
Log Message:
Rechanged the way the scumm class is choose (sorry, can't make up my mind). Implemented the different versions of loadCharset

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Makefile	25 Mar 2002 01:20:05 -0000	1.28
--- Makefile	25 Mar 2002 02:09:04 -0000	1.29
***************
*** 16,20 ****
  	sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
  	sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o \
! 	akos.o vars.o insane.o gameDetecter.o v3/resource.o
  
  DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
--- 16,20 ----
  	sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
  	sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o \
! 	akos.o vars.o insane.o gameDetecter.o v3/resource.o v4/resource.o
  
  DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** resource.cpp	25 Mar 2002 01:20:05 -0000	1.60
--- resource.cpp	25 Mar 2002 02:09:04 -0000	1.61
***************
*** 400,422 ****
  	
  	debug(9, "loadCharset(%d)",no);
!         if(_features & GF_EXTERNAL_CHARSET) {                
! 				uint32 size;
  
-                 checkRange(4 ,0 ,no , "Loading illegal charset %d");
-                 openRoom(-1);
-                 if( _features & GF_SMALL_NAMES)
-                         openRoom(98+no);
-                 else
-                         openRoom(900+no);
- 				
- 				if (_features & GF_OLD256)
- 					size = fileReadWordLE();
- 				else
- 					size = fileReadDwordLE();
-                 fileRead(_fileHandle, createResource(6, no, size), size);
-                 openRoom(-1);
-         } else {
-                 checkRange(_maxCharsets-1, 1, no, "Loading illegal charset %d");
-         }
  //	ensureResourceLoaded(6, no);
  	ptr = getResourceAddress(6, no);
--- 400,406 ----
  	
  	debug(9, "loadCharset(%d)",no);
!                 
! 	checkRange(_maxCharsets-1, 1, no, "Loading illegal charset %d");
  
  //	ensureResourceLoaded(6, no);
  	ptr = getResourceAddress(6, no);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** scumm.h	25 Mar 2002 01:40:51 -0000	1.101
--- scumm.h	25 Mar 2002 02:09:04 -0000	1.102
***************
*** 812,816 ****
  	void readMAXS();
  	virtual void readIndexFile();
! 	void loadCharset(int i);
  	void nukeCharset(int i);
  
--- 812,816 ----
  	void readMAXS();
  	virtual void readIndexFile();
! 	virtual void loadCharset(int i);
  	void nukeCharset(int i);
  
***************
*** 1669,1676 ****
--- 1669,1678 ----
  public:
  	void readIndexFile();
+ 	virtual void loadCharset(int no);
  };
  
  class Scumm_v4 : public Scumm_v3
  {
+ 	void loadCharset(int no);
  };
  

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** sdl.cpp	25 Mar 2002 01:40:51 -0000	1.59
--- sdl.cpp	25 Mar 2002 02:09:04 -0000	1.60
***************
*** 926,950 ****
  		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;
! 	}
  		
  
--- 926,942 ----
  		return(-1);
  
! 	if(detecter._features & GF_OLD256)
! 		scumm = new Scumm_v3;
! 	else
! 	if(detecter._features & GF_SMALL_HEADER) // this force loomCD as v4
! 		scumm = new Scumm_v4;
! 	else
! 	if(detecter._features & GF_AFTER_V7)
! 		scumm = new Scumm_v7;
! 	else
! 	if(detecter._features & GF_AFTER_V6) // this force SamnmaxCD as v6
! 		scumm = new Scumm_v6;
! 	else
! 		scumm = new Scumm_v5;
  		
  





More information about the Scummvm-git-logs mailing list