[Scummvm-cvs-logs] CVS: scummvm/sword1 sword1.cpp,1.27,1.28 sword1.h,1.10,1.11

Max Horn fingolfin at users.sourceforge.net
Sun Jan 4 06:02:44 CET 2004


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv2726/sword1

Modified Files:
	sword1.cpp sword1.h 
Log Message:
renamed global var _debugLevel to g_debugLevel; let Engine constructor init it (this way all engines get it for free, allows further cleanup); removed some useless/duplicate member vars in SwordEngine

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sword1.cpp	4 Jan 2004 05:21:22 -0000	1.27
+++ sword1.cpp	4 Jan 2004 14:00:58 -0000	1.28
@@ -82,15 +82,9 @@
 	strcpy(buf2, buf1);
 }
 
-extern uint16 _debugLevel;
-
 SwordEngine::SwordEngine(GameDetector *detector, OSystem *syst)
 	: Engine(syst) {
 
-	_detector = detector;
-	_system = syst;
-	_debugLevel = ConfMan.getInt("debuglevel");
-	
 	if (!_mixer->isReady())
 		warning("Sound initialization failed");
 }

Index: sword1.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sword1.h	30 Dec 2003 22:57:52 -0000	1.10
+++ sword1.h	4 Jan 2004 14:00:58 -0000	1.11
@@ -71,9 +71,6 @@
 	uint16 _mouseX, _mouseY, _mouseState;
 	uint8 _keyPressed;
 
-	GameDetector *_detector;
-	OSystem		*_system;
-
 	MemMan		*_memMan;
 	ResMan		*_resMan;
 	ObjectMan	*_objectMan;





More information about the Scummvm-git-logs mailing list