[Scummvm-cvs-logs] CVS: scummvm/sword2 console.cpp,1.24,1.25 sword2.cpp,1.70,1.71 sword2.h,1.28,1.29

Max Horn fingolfin at users.sourceforge.net
Sat Nov 1 18:19:04 CET 2003


Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv15749/sword2

Modified Files:
	console.cpp sword2.cpp sword2.h 
Log Message:
turned NewGui into a singleton, and made OSystem a pseudo-singleton; added Widget::findWidget (preparing to add support for nested widgets, for the tab widget)

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- console.cpp	28 Oct 2003 19:51:27 -0000	1.24
+++ console.cpp	2 Nov 2003 02:18:16 -0000	1.25
@@ -48,7 +48,7 @@
 }
 
 Debugger::Debugger(Sword2Engine *s)
-	: Common::Debugger<Debugger>(s->_newgui) {
+	: Common::Debugger<Debugger>() {
 	_vm = s;
 
 	// Register commands

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- sword2.cpp	1 Nov 2003 17:08:23 -0000	1.70
+++ sword2.cpp	2 Nov 2003 02:18:16 -0000	1.71
@@ -52,7 +52,6 @@
 extern bool isSmartphone(void);
 #endif
 
-extern NewGui *g_gui;
 extern uint16 _debugLevel;
 
 static const GameSettings sword2_settings[] = {
@@ -117,7 +116,6 @@
 
 	_detector = detector;
 	g_sword2 = this;
-	_newgui = NULL;
 	_debugger = NULL;
 	_features = detector->_game.features;
 	_targetName = strdup(detector->_targetName.c_str());
@@ -139,7 +137,6 @@
 	g_display = _display = new Display(640, 480);
 	gui = new Gui();
 
-	_newgui = g_gui;
 	_debugger = new Debugger(this);
 
 	_lastPaletteRes = 0;

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- sword2.h	1 Nov 2003 16:55:20 -0000	1.28
+++ sword2.h	2 Nov 2003 02:18:16 -0000	1.29
@@ -34,8 +34,6 @@
 	GF_DEMO	= 1 << 0
 };
 
-class NewGui;
-
 namespace Sword2 {
 
 // Bodge for PCF76 version so that their demo CD can be labelled "PCF76"
@@ -140,7 +138,6 @@
 	Sound *_sound;
 	Display *_display;
 
-	NewGui *_newgui;
 	Debugger *_debugger;
 
 	Common::RandomSource _rnd;





More information about the Scummvm-git-logs mailing list