[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.105,1.106 scummvm.cpp,2.531,2.532
Max Horn
fingolfin at users.sourceforge.net
Sun Jan 4 06:02:18 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.76,2.77 gfx.cpp,2.246,2.247 gfx.h,1.52,1.53 script_v6.cpp,1.239,1.240
- Next message: [Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2726/scumm
Modified Files:
debugger.cpp scummvm.cpp
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: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- debugger.cpp 3 Jan 2004 22:45:23 -0000 1.105
+++ debugger.cpp 4 Jan 2004 14:00:57 -0000 1.106
@@ -35,7 +35,7 @@
#include "common/debugger.cpp"
-extern uint16 _debugLevel;
+extern uint16 g_debugLevel;
namespace Scumm {
@@ -524,10 +524,10 @@
if (_vm->_debugMode == false)
DebugPrintf("Debugging is not enabled at this time\n");
else
- DebugPrintf("Debugging is currently set at level %d\n", _debugLevel);
+ DebugPrintf("Debugging is currently set at level %d\n", g_debugLevel);
} else { // set level
int level = atoi(argv[1]);
- _debugLevel = level;
+ g_debugLevel = level;
if (level > 0) {
_vm->_debugMode = true;
DebugPrintf("Debug level set to level %d\n", level);
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.531
retrieving revision 2.532
diff -u -d -r2.531 -r2.532
--- scummvm.cpp 4 Jan 2004 13:46:53 -0000 2.531
+++ scummvm.cpp 4 Jan 2004 14:00:57 -0000 2.532
@@ -68,8 +68,6 @@
extern bool isSmartphone(void);
#endif
-extern uint16 _debugLevel;
-
namespace Scumm {
enum MouseButtonStatus {
@@ -618,7 +616,6 @@
// Read settings from the detector & config manager
_debugMode = ConfMan.hasKey("debuglevel");
- _debugLevel = ConfMan.getInt("debuglevel");
_dumpScripts = detector->_dumpScripts;
_bootParam = ConfMan.getInt("boot_param");
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.76,2.77 gfx.cpp,2.246,2.247 gfx.h,1.52,1.53 script_v6.cpp,1.239,1.240
- Next message: [Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list