thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: Sync with ScummVM - rev. ea3f8f2e33

Browse source
This commit is contained in:
Bastien Bouclet 2019-06-29 19:08:44 +02:00
parent 308c018141
commit d474e3f94f
155 changed files with 11308 additions and 6208 deletions
Download patch file Download diff file Expand all files Collapse all files

39
backends/platform/sdl/riscos/riscos.cpp
View file

@ -26,6 +26,7 @@
#include "backends/platform/sdl/riscos/riscos.h"
#include "backends/saves/default/default-saves.h"
#include "backends/events/riscossdl/riscossdl-events.h"
#include "backends/fs/riscos/riscos-fs-factory.h"
#include "backends/fs/riscos/riscos-fs.h"
@ -36,6 +37,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 +50,12 @@ void OSystem_RISCOS::init() {
}
void OSystem_RISCOS::initBackend() {
ConfMan.registerDefault("enable_reporter", false);
// Create the events manager
if (_eventSource == 0)
_eventSource = new RISCOSSdlEventSource();
// Create the savefile manager
if (_savefileManager == 0) {
Common::String savePath = "/<Choices$Write>/ResidualVM/Saves";
@ -76,6 +87,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>/ResidualVM/residualvm";
}