Expose interface screen size settings outside of compatibility mode

PiratesAhoy · Oct 6, 2024 · b6991b7 · b6991b7
1 parent 37cf3ff
commit b6991b7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/libs/core/src/core_impl.cpp b/src/libs/core/src/core_impl.cpp
@@ -280,6 +280,7 @@ void CoreImpl::ProcessEngineIniFile()
     }
 
     loadCompatibilitySettings(*engine_ini);
+    determineScreenSize(*engine_ini);
 
     res = engine_ini->ReadString(nullptr, "run", String, sizeof(String), "");
     if (res)
@@ -290,7 +291,7 @@ void CoreImpl::ProcessEngineIniFile()
             throw std::runtime_error("fail to run program");
 
         // Script version test
-        if (targetVersion_ >= storm::ENGINE_VERSION::LATEST)
+        if (targetVersion_ == storm::ENGINE_VERSION::TO_EACH_HIS_OWN)
         {
             int32_t iScriptVersion = 0xFFFFFFFF;
             auto *pVScriptVersion = static_cast<VDATA *>(core_internal.GetScriptVariable("iScriptVersion"));
@@ -926,15 +927,7 @@ storm::ENGINE_VERSION CoreImpl::GetTargetEngineVersion() const noexcept
 
 ScreenSize CoreImpl::GetScreenSize() const noexcept
 {
-    switch (targetVersion_)
-    {
-    case storm::ENGINE_VERSION::PIRATES_OF_THE_CARIBBEAN: {
-        return {640, 480};
-    }
-    default: {
-        return {800, 600};
-    }
-    }
+    return screenSize_;
 }
 
 void CoreImpl::stopFrameProcessing()
@@ -1042,3 +1035,16 @@ void CoreImpl::loadCompatibilitySettings(INIFILE &inifile)
         targetVersion_ = ENGINE_VERSION::LATEST;
     }
 }
+
+void CoreImpl::determineScreenSize(INIFILE &inifile)
+{
+    if (targetVersion_ <= storm::ENGINE_VERSION::PIRATES_OF_THE_CARIBBEAN) {
+        screenSize_ = {640, 480};
+    }
+    else {
+        screenSize_ = {800, 600};
+    }
+
+    screenSize_.width = inifile.GetInt("interface", "screen_width", screenSize_.width);
+    screenSize_.height = inifile.GetInt("interface", "screen_height", screenSize_.height);
+}
diff --git a/src/libs/core/src/core_impl.h b/src/libs/core/src/core_impl.h
@@ -148,10 +148,12 @@ class CoreImpl final : public CorePrivate
 
 private:
     void loadCompatibilitySettings(INIFILE &inifile);
+    void determineScreenSize(INIFILE &inifile);
 
     EntityManager entity_manager_;
 
     storm::ENGINE_VERSION targetVersion_ = storm::ENGINE_VERSION::LATEST;
+    ScreenSize screenSize_;
 
     bool stopFrameProcessing_ = false;