[Scummvm-git-logs] scummvm master -> 62660da0bc8bdbaa464f8b25ee993f6dfb90aa85
digitall
dgturner at iee.org
Fri Apr 5 19:50:09 CEST 2019
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
62660da0bc RISCOS: Log messages using !Reporter
Commit: 62660da0bc8bdbaa464f8b25ee993f6dfb90aa85
https://github.com/scummvm/scummvm/commit/62660da0bc8bdbaa464f8b25ee993f6dfb90aa85
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-04-05T18:50:05+01:00
Commit Message:
RISCOS: Log messages using !Reporter
Changed paths:
backends/platform/sdl/riscos/riscos.cpp
backends/platform/sdl/riscos/riscos.h
diff --git a/backends/platform/sdl/riscos/riscos.cpp b/backends/platform/sdl/riscos/riscos.cpp
index 73c0fda..ac1cdad 100644
--- a/backends/platform/sdl/riscos/riscos.cpp
+++ b/backends/platform/sdl/riscos/riscos.cpp
@@ -36,6 +36,10 @@
#define URI_Dispatch 0x4e381
#endif
+#ifndef Report_Text0
+#define Report_Text0 0x54c80
+#endif
+
void OSystem_RISCOS::init() {
// Initialze File System Factory
_fsFactory = new RISCOSFilesystemFactory();
@@ -45,6 +49,8 @@ void OSystem_RISCOS::init() {
}
void OSystem_RISCOS::initBackend() {
+ ConfMan.registerDefault("enable_reporter", false);
+
// Create the savefile manager
if (_savefileManager == 0) {
Common::String savePath = "/<Choices$Write>/ScummVM/Saves";
@@ -76,6 +82,34 @@ bool OSystem_RISCOS::openUrl(const Common::String &url) {
return true;
}
+void OSystem_RISCOS::logMessage(LogMessageType::Type type, const char *message) {
+ OSystem_SDL::logMessage(type, message);
+
+ // Log messages using !Reporter, available from http://www.avisoft.force9.co.uk/Reporter.htm
+ if (!ConfMan.getBool("enable_reporter"))
+ return;
+
+ char colour;
+ switch (type) {
+ case LogMessageType::kError:
+ colour = 'r';
+ break;
+ case LogMessageType::kWarning:
+ colour = 'o';
+ break;
+ case LogMessageType::kInfo:
+ colour = 'l';
+ break;
+ case LogMessageType::kDebug:
+ default:
+ colour = 'f';
+ break;
+ }
+
+ Common::String report = Common::String::format("\\%c %s", colour, message);
+ _swix(Report_Text0, _IN(0), report.c_str());
+}
+
Common::String OSystem_RISCOS::getDefaultConfigFileName() {
return "/<Choices$Write>/ScummVM/scummvmrc";
}
diff --git a/backends/platform/sdl/riscos/riscos.h b/backends/platform/sdl/riscos/riscos.h
index fb23a3e..49ac5a22 100644
--- a/backends/platform/sdl/riscos/riscos.h
+++ b/backends/platform/sdl/riscos/riscos.h
@@ -34,6 +34,8 @@ public:
virtual bool openUrl(const Common::String &url);
+ virtual void logMessage(LogMessageType::Type type, const char *message);
+
protected:
/**
* The path of the currently open log file, if any.
More information about the Scummvm-git-logs
mailing list