[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.208,2.209 scumm.h,1.240,1.241

[Bertrand Augereau]

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

Modified Files:
	scummvm.cpp scumm.h 
Log Message:
put a setFeatures member that allows to precompute game-wide stuff, such as CostumeRenderer, when features change, ie extremely rarely

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.208
retrieving revision 2.209
diff -u -d -r2.208 -r2.209
--- scummvm.cpp	4 Jun 2003 21:45:29 -0000	2.208
+++ scummvm.cpp	4 Jun 2003 23:02:51 -0000	2.209
@@ -548,7 +548,7 @@
 	_exe_name = strdup(detector->_gameRealName.c_str());	// FIXME: probably should use String class here
 	_game_name = strdup(detector->_gameFileName.c_str());
 	_gameId = detector->_gameId;
-	_features = detector->_features;
+	setFeatures (detector->_features);
 	_noSubtitles = detector->_noSubtitles;
 	_defaultTalkDelay = detector->_talkSpeed;
 	_use_adlib = detector->_use_adlib;
@@ -730,6 +730,11 @@
 	destroy();
 
 	delete g_debugger;
+}
+
+void Scumm::setFeatures (uint32 newFeatures)
+{
+	_features = newFeatures;
 }
 
 void Scumm::scummInit() {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- scumm.h	4 Jun 2003 21:45:29 -0000	1.240
+++ scumm.h	4 Jun 2003 23:02:51 -0000	1.241
@@ -270,7 +270,10 @@
 	IMuse *_imuse;
 	IMuseDigital *_imuseDigital;
 	Player_V2 *_playerV2;
-	uint32 _features;
+
+	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)
+
 	VerbSlot *_verbs;
 	ObjectData *_objs;
 	ScummDebugger *_debugger;