diff options
| author | Johannes Schickel | 2006-01-27 15:43:23 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-01-27 15:43:23 +0000 |
| commit | 5051b080a2cfefef81907be0324e229f284ae355 (patch) | |
| tree | af2b67affe5aaf357c3278e3befdbd412dea5545 /sky | |
| parent | 901645cb0f28ef0278e5b5e3a7347a85f9142b8b (diff) | |
| download | scummvm-rg350-5051b080a2cfefef81907be0324e229f284ae355.tar.gz scummvm-rg350-5051b080a2cfefef81907be0324e229f284ae355.tar.bz2 scummvm-rg350-5051b080a2cfefef81907be0324e229f284ae355.zip | |
- 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.
svn-id: r20227
Diffstat (limited to 'sky')
| -rw-r--r-- | sky/debug.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sky/debug.cpp b/sky/debug.cpp index d16a66c55a..e7ac7c66e6 100644 --- a/sky/debug.cpp +++ b/sky/debug.cpp @@ -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 @@ void Debug::mcode(uint32 mcode, uint32 a, uint32 b, uint32 c) { 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); |