diff options
Diffstat (limited to 'backends/platform/null/null.cpp')
| -rw-r--r-- | backends/platform/null/null.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp index 7dd127fefa..4690a67c55 100644 --- a/backends/platform/null/null.cpp +++ b/backends/platform/null/null.cpp @@ -34,7 +34,7 @@ */ #if defined(__amigaos4__) #include "backends/fs/amigaos4/amigaos4-fs-factory.h" -#elif defined(UNIX) +#elif defined(POSIX) #include "backends/fs/posix/posix-fs-factory.h" #elif defined(WIN32) #include "backends/fs/windows/windows-fs-factory.h" @@ -53,14 +53,13 @@ public: virtual void delayMillis(uint msecs); virtual void getTimeAndDate(TimeDate &t) const {} - virtual Common::SeekableReadStream *createConfigReadStream(); - virtual Common::WriteStream *createConfigWriteStream(); + virtual void logMessage(LogMessageType::Type type, const char *message); }; OSystem_NULL::OSystem_NULL() { #if defined(__amigaos4__) _fsFactory = new AmigaOSFilesystemFactory(); - #elif defined(UNIX) + #elif defined(POSIX) _fsFactory = new POSIXFilesystemFactory(); #elif defined(WIN32) _fsFactory = new WindowsFilesystemFactory(); @@ -73,12 +72,11 @@ OSystem_NULL::~OSystem_NULL() { } void OSystem_NULL::initBackend() { - _mutexManager = (MutexManager *)new NullMutexManager(); + _mutexManager = new NullMutexManager(); _timerManager = new DefaultTimerManager(); _eventManager = new DefaultEventManager(this); _savefileManager = new DefaultSaveFileManager(); - _graphicsManager = (GraphicsManager *)new NullGraphicsManager(); - _audiocdManager = (AudioCDManager *)new DefaultAudioCDManager(); + _graphicsManager = new NullGraphicsManager(); _mixer = new Audio::MixerImpl(this, 22050); ((Audio::MixerImpl *)_mixer)->setReady(false); @@ -87,7 +85,7 @@ void OSystem_NULL::initBackend() { // this way; they need to be hooked into the system somehow to // be functional. Of course, can't do that in a NULL backend :). - OSystem::initBackend(); + ModularBackend::initBackend(); } bool OSystem_NULL::pollEvent(Common::Event &event) { @@ -101,16 +99,16 @@ uint32 OSystem_NULL::getMillis() { void OSystem_NULL::delayMillis(uint msecs) { } -#define DEFAULT_CONFIG_FILE "scummvm.ini" +void OSystem_NULL::logMessage(LogMessageType::Type type, const char *message) { + FILE *output = 0; -Common::SeekableReadStream *OSystem_NULL::createConfigReadStream() { - Common::FSNode file(DEFAULT_CONFIG_FILE); - return file.createReadStream(); -} + if (type == LogMessageType::kInfo || type == LogMessageType::kDebug) + output = stdout; + else + output = stderr; -Common::WriteStream *OSystem_NULL::createConfigWriteStream() { - Common::FSNode file(DEFAULT_CONFIG_FILE); - return file.createWriteStream(); + fputs(message, output); + fflush(output); } OSystem *OSystem_NULL_create() { |