[Scummvm-cvs-logs] CVS: scummvm/sky debug.cpp,1.24,1.25

[Johannes Schickel]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10168/sky

Modified Files:
	debug.cpp 
Log Message:
 - adds the new gui renderer also a new implementation for the classic gui
 - adds a ImageMan and ImageDec class for loading and managing image files
 - adds a loader for zip files which is used by the new theme and the image manager
 - changes the widgets to use the new gui code
 - changes the scumm dialogs to use the new gui code
 - fixes a #include problem in the sky debugger with the new gui code

 To use the new gui copy gui/themes/default-theme.zip to your extrapath.
If the theme zip can not be found the gui will fallback to the classic theme.
If you want to change the gui styles use "gui_theme=classic" for the classic theme
and "gui_theme=default-theme" for the new theme.

Thanks to eriktorbjorn for testing and help with the new theme and to sev for 
reviewing this patch.


Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/debug.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- debug.cpp	27 Jan 2006 14:35:40 -0000	1.24
+++ debug.cpp	27 Jan 2006 15:43:23 -0000	1.25
@@ -21,6 +21,8 @@
 
 #include "common/stdafx.h"
 #include "common/util.h"
+#include "common/debugger.cpp"
+
 #include "sky/debug.h"
 #include "sky/grid.h"
 #include "sky/logic.h"
@@ -30,8 +32,6 @@
 #include "sky/struc.h"
 #include "sky/compact.h"
 
-#include "common/debugger.cpp"
-
 namespace Sky {
 
 static const char *section_0_compacts[] = {
@@ -1278,7 +1278,7 @@
 
 
 Debugger::Debugger(Logic *logic, Mouse *mouse, Screen *screen, SkyCompact *skyCompact)
-: _logic(logic), _mouse(mouse), _screen(screen), _skyCompact(skyCompact), _showGrid(false) {
+: Common::Debugger<Debugger>(), _logic(logic), _mouse(mouse), _screen(screen), _skyCompact(skyCompact), _showGrid(false) {
 	DCmd_Register("exit", &Debugger::Cmd_Exit);
 	DCmd_Register("help", &Debugger::Cmd_Help);
 	DCmd_Register("info", &Debugger::Cmd_Info);