diff options
author | Max Horn | 2010-10-19 09:44:48 +0000 |
---|---|---|
committer | Max Horn | 2010-10-19 09:44:48 +0000 |
commit | 4caa1d40a8cdfc7efad298f607eddd9cd7e6019e (patch) | |
tree | 1426c5e4760fe12f3ead9ccfe5619d17bef07140 /engines/sword25/kernel | |
parent | 8f5eee67dbbc69979ca4b4527307277410f99956 (diff) | |
download | scummvm-rg350-4caa1d40a8cdfc7efad298f607eddd9cd7e6019e.tar.gz scummvm-rg350-4caa1d40a8cdfc7efad298f607eddd9cd7e6019e.tar.bz2 scummvm-rg350-4caa1d40a8cdfc7efad298f607eddd9cd7e6019e.zip |
SWORD25: Simplify log listener code (and get rid of another global constructor)
svn-id: r53610
Diffstat (limited to 'engines/sword25/kernel')
-rw-r--r-- | engines/sword25/kernel/log.cpp | 8 | ||||
-rw-r--r-- | engines/sword25/kernel/log.h | 13 |
2 files changed, 3 insertions, 18 deletions
diff --git a/engines/sword25/kernel/log.cpp b/engines/sword25/kernel/log.cpp index 95691e6b48..43a3ee0105 100644 --- a/engines/sword25/kernel/log.cpp +++ b/engines/sword25/kernel/log.cpp @@ -52,7 +52,6 @@ const char *BS_Log::_Prefix = NULL; const char *BS_Log::_File = NULL; int BS_Log::_Line = 0; bool BS_Log::_AutoNewline = false; -Common::Array<BS_Log::LOG_LISTENER_CALLBACK> BS_Log::_LogListener; bool BS_Log::_CreateLog() { // Open the log file @@ -185,11 +184,10 @@ void BS_Log::LogDecorated(const char *Format, ...) { } int BS_Log::_WriteLog(const char *Message) { - if (!_LogFile) if (!_CreateLog()) return false; + if (!_LogFile && !_CreateLog()) + return false; - Common::Array<LOG_LISTENER_CALLBACK>::iterator Iter = _LogListener.begin(); - for (; Iter != _LogListener.end(); ++Iter) - (*Iter)(Message); + debugN(0, "%s", Message); _LogFile->writeString(Message); diff --git a/engines/sword25/kernel/log.h b/engines/sword25/kernel/log.h index 1fe9ff4ed6..02cfa3ab81 100644 --- a/engines/sword25/kernel/log.h +++ b/engines/sword25/kernel/log.h @@ -76,18 +76,6 @@ public: _AutoNewline = AutoNewline; } - typedef void (*LOG_LISTENER_CALLBACK)(const char *); - static void RegisterLogListener(LOG_LISTENER_CALLBACK Callback) { - _LogListener.push_back(Callback); - } - static bool IsListenerRegistered(LOG_LISTENER_CALLBACK Callback) { - Common::Array<LOG_LISTENER_CALLBACK>::iterator i; - for (i = _LogListener.begin(); i != _LogListener.end(); ++i) { - if (**i == Callback) - return true; - } - return false; - } static void _CloseLog(); private: @@ -97,7 +85,6 @@ private: static const char *_File; static int _Line; static bool _AutoNewline; - static Common::Array<LOG_LISTENER_CALLBACK> _LogListener; static bool _CreateLog(); |