diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/debugger.cpp | 4 | ||||
| -rw-r--r-- | common/debugger.h | 3 | ||||
| -rw-r--r-- | common/module.mk | 1 | ||||
| -rw-r--r-- | common/singleton.h | 4 | ||||
| -rw-r--r-- | common/system.h | 3 |
5 files changed, 9 insertions, 6 deletions
diff --git a/common/debugger.cpp b/common/debugger.cpp index 8723ad317f..f47fee07f8 100644 --- a/common/debugger.cpp +++ b/common/debugger.cpp @@ -33,7 +33,7 @@ extern void force_keyboard(bool); namespace Common { template <class T> -Debugger<T>::Debugger(NewGui *gui) { +Debugger<T>::Debugger() { _frame_countdown = 0; _dvar_count = 0; _dcmd_count = 0; @@ -41,7 +41,7 @@ Debugger<T>::Debugger(NewGui *gui) { _isAttached = false; _errStr = NULL; _firstTime = true; - _debuggerDialog = new ConsoleDialog(gui, 1.0, 0.67F); + _debuggerDialog = new ConsoleDialog(1.0, 0.67F); _debuggerDialog->setInputCallback(debuggerInputCallback, this); _debuggerDialog->setCompletionCallback(debuggerCompletionCallback, this); } diff --git a/common/debugger.h b/common/debugger.h index f00910d8ea..7946e5940d 100644 --- a/common/debugger.h +++ b/common/debugger.h @@ -22,7 +22,6 @@ #define COMMON_DEBUGGER_H class ConsoleDialog; -class NewGui; namespace Common { @@ -32,7 +31,7 @@ namespace Common { template <class T> class Debugger { public: - Debugger(NewGui *gui); + Debugger(); virtual ~Debugger(); int DebugPrintf(const char *format, ...); diff --git a/common/module.mk b/common/module.mk index b55428edab..aac0ddda85 100644 --- a/common/module.mk +++ b/common/module.mk @@ -8,6 +8,7 @@ MODULE_OBJS := \ common/timer.o \ common/util.o \ common/savefile.o \ + common/system.o \ common/scaler/2xsai.o \ common/scaler/aspect.o \ common/scaler/hq2x.o \ diff --git a/common/singleton.h b/common/singleton.h index be40b45f42..89d912f69a 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -48,8 +48,8 @@ protected: ~Singleton<T>() { } private: - Singleton(const Singleton&); - Singleton& operator= (const Singleton&); + Singleton<T>(const Singleton<T>&); + Singleton<T>& operator= (const Singleton<T>&); }; } // End of namespace Common diff --git a/common/system.h b/common/system.h index 164316f71d..9350830d91 100644 --- a/common/system.h +++ b/common/system.h @@ -38,6 +38,9 @@ */ class OSystem { public: + static OSystem *instance(); + +public: typedef struct Mutex *MutexRef; typedef void (*SoundProc)(void *param, byte *buf, int len); typedef int (*TimerProc)(int interval); |