[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.99,1.100 scumm.h,1.84,1.85

Max Horn fingolfin at users.sourceforge.net
Mon Dec 16 14:44:09 CET 2002


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

Modified Files:
	scummvm.cpp scumm.h 
Log Message:
Endy, when I am gonna meet you, I'll have to kick, punch and bite you a bit for using the same name for two entierly different classes, then adding new files (and at the same time not removing obsolete files), and finally using the WRONG BLOODY HEADER. I spent an hour to track this one down

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- scummvm.cpp	16 Dec 2002 12:12:31 -0000	1.99
+++ scummvm.cpp	16 Dec 2002 22:43:36 -0000	1.100
@@ -24,7 +24,7 @@
 #include "scumm.h"
 #include "actor.h"
 #include "bundle.h"
-#include "debug.h"
+#include "debugger.h"
 #include "dialogs.h"
 #include "imuse.h"
 #include "object.h"
@@ -1002,11 +1002,6 @@
 	runDialog(_saveLoadDialog);
 }
 
-void Scumm::debuggerDialog()
-{
-	g_debugger.attach(this);
-}
-
 void Scumm::optionsDialog()
 {
 	if (!_optionsDialog)
@@ -1136,7 +1131,7 @@
 
 		_vars[VAR_CHARINC] = _defaultTalkDelay / 20;
 	} else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console
-		debuggerDialog();
+		g_debugger.attach(this);
 	}
 
 	_mouseButStat = _lastKeyHit;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- scumm.h	16 Dec 2002 12:12:31 -0000	1.84
+++ scumm.h	16 Dec 2002 22:43:37 -0000	1.85
@@ -360,7 +360,6 @@
 	void pauseDialog();
 	void saveloadDialog();
 	void optionsDialog();
-	void debuggerDialog();
 	void displayError(const char *message, ...);
 
 	// Misc startup/event functions





More information about the Scummvm-git-logs mailing list