[Scummvm-git-logs] scummvm master -> ec62b546da99977a0d668549bc3595149319df52

[ccawley2011]

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:
ec62b546da NULL: Always implement OSystem::addSysArchivesToSearchSet()


Commit: ec62b546da99977a0d668549bc3595149319df52
    https://github.com/scummvm/scummvm/commit/ec62b546da99977a0d668549bc3595149319df52
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-11-15T22:33:22Z

Commit Message:
NULL: Always implement OSystem::addSysArchivesToSearchSet()

Changed paths:
    backends/platform/null/null.cpp


diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 340f0298c8..4e69d933c4 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -83,9 +83,7 @@ public:
 
 	virtual void logMessage(LogMessageType::Type type, const char *message);
 
-#ifdef NULL_DRIVER_USE_FOR_TEST
 	virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority);
-#endif
 
 private:
 #ifdef POSIX
@@ -215,6 +213,11 @@ void OSystem_NULL::logMessage(LogMessageType::Type type, const char *message) {
 	fflush(output);
 }
 
+void OSystem_NULL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+	s.add("dists/engine-data", new Common::FSDirectory("dists/engine-data", 4), priority);
+	s.add("gui/themes", new Common::FSDirectory("gui/themes", 4), priority);
+}
+
 OSystem *OSystem_NULL_create() {
 	return new OSystem_NULL();
 }
@@ -230,11 +233,6 @@ int main(int argc, char *argv[]) {
 	return res;
 }
 #else
-void OSystem_NULL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
-	Common::String dataPath = "dists/engine-data";
-	Common::FSNode dataNode(dataPath);
-	s.add(dataPath, new Common::FSDirectory(dataNode, 4), priority);
-}
 void Common::install_null_g_system() {
 	g_system = OSystem_NULL_create();
 }