[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.345,1.346 scummvm.cpp,2.530,2.531

Max Horn fingolfin at users.sourceforge.net
Sun Jan 4 05:48:15 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv32234

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
removed setFeatures (not needed anymore)

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -d -r1.345 -r1.346
--- scumm.h	3 Jan 2004 22:45:23 -0000	1.345
+++ scumm.h	4 Jan 2004 13:46:53 -0000	1.346
@@ -265,8 +265,6 @@
 	byte _version;
 	uint32 _features;						// Should only be accessed for reading (TODO enforce it compiler-wise with making it private and creating an accessor)
 
-	void setFeatures (uint32 newFeatures);	// Changes the features set. This allows some gamewide stuff to be precalculated/prepared (ie CostumeRenderer)
-
 	/** Random number generator */
 	Common::RandomSource _rnd;
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.530
retrieving revision 2.531
diff -u -d -r2.530 -r2.531
--- scummvm.cpp	4 Jan 2004 13:09:02 -0000	2.530
+++ scummvm.cpp	4 Jan 2004 13:46:53 -0000	2.531
@@ -993,24 +993,6 @@
 	_saveLoadFlag = 0;
 }
 
-void ScummEngine::setFeatures(uint32 newFeatures) {
-	bool amigaPalette = (_features & GF_AMIGA) != 0;
-	bool newAmigaPalette = (newFeatures & GF_AMIGA) != 0;
-
-	if ((_features ^ newFeatures) & ~GF_AMIGA) {
-		error("setFeatures may only be used to toggle GF_AMIGA flag!");
-	}
-
-	_features = newFeatures;
-	
-	if ((_features & GF_16COLOR) && amigaPalette != newAmigaPalette) {
-		if (_features & GF_AMIGA)
-			setupAmigaPalette();
-		else
-			setupEGAPalette();
-	}
-}
-
 void ScummEngine::scummInit() {
 	int i;
 





More information about the Scummvm-git-logs mailing list