Merge pull request #167 from Spartan322/update/godot4.2-stable

.github/workflows/builds.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   GODOT_BASE_DOWNLOAD_URL: https://github.com/godotengine/godot
-  GODOT_VERSION: 4.1.3
+  GODOT_VERSION: 4.2
   GODOT_VERSION_TYPE: stable
   OPENVIC_BASE_BRANCH: master
 

README.md

@@ -5,7 +5,7 @@ Main Repo for the OpenVic Project
 For detailed instructions, view the Contributor Quickstart Guide [here](docs/contribution-quickstart-guide.md)
 
 ## System Requirements
-* [Godot 4.1.3](https://github.com/godotengine/godot/releases/tag/4.1.3-stable)
+* [Godot 4.2](https://github.com/godotengine/godot/releases/tag/4.2-stable)
 * [scons](https://scons.org/)
 
 See [System Requirements](docs/contribution/system-requirements.md).
@@ -21,7 +21,7 @@ See [Cloning](docs/contribution/cloning.md).
 ## [Godot Documentation](https://docs.godotengine.org/en/latest/)
 
 ## Build/Run Instructions
-1. Install [Godot 4.1.3](https://github.com/godotengine/godot/releases/tag/4.1.3-stable) and [scons](https://scons.org/) for your system.
+1. Install [Godot 4.2](https://github.com/godotengine/godot/releases/tag/4.2-stable) and [scons](https://scons.org/) for your system.
 2. Run the command `git submodule update --init --recursive` to retrieve all related submodules.
 3. Run `scons` in the project root, you should see a libopenvic file in `game/bin/openvic`.
 4. Open with Godot 4, click import and navigate to the `game` directory.

SConstruct

@@ -12,19 +12,15 @@ env = SConscript("scripts/SConstruct")
 
 env.PrependENVPath("PATH", os.getenv("PATH"))
 
-OLD_ARGS = ARGUMENTS.copy()
-ARGUMENTS["compiledb"] = False
 opts = env.SetupOptions()
 
 env.FinalizeOptions()
-ARGUMENTS = OLD_ARGS
 
 # Needs Clone, else godot-cpp builds using our modified environment variables. eg: godot-cpp builds on C++20
 OLD_ARGS = SCons.Script.ARGUMENTS.copy()
 SCons.Script.ARGUMENTS["use_static_cpp"] = env["use_static_cpp"]
 SCons.Script.ARGUMENTS["disable_exceptions"] = env["disable_exceptions"]
-if ARGUMENTS.get("compiledb", False):
-    SCons.Script.ARGUMENTS["compiledb"] = True
+SCons.Script.ARGUMENTS["compiledb_file"] = 'godot-cpp/compile_commands.json'
 godot_env = SConscript("godot-cpp/SConstruct")
 SCons.Script.ARGUMENTS = OLD_ARGS
 
@@ -91,4 +87,8 @@ if "env" in locals():
     # FIXME: This method mixes both cosmetic progress stuff and cache handling...
     env.show_progress(env)
 
+# Add compiledb if the option is set
+if env.get("compiledb", False):
+    default_args += ["compiledb"]
+
 Default(*default_args)

extension/src/openvic-extension/singletons/GameSingleton.cpp

@@ -1,5 +1,7 @@
 #include "GameSingleton.hpp"
 
+#include <functional>
+
 #include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/core/error_macros.hpp>
 #include <godot_cpp/variant/utility_functions.hpp>
@@ -553,7 +555,8 @@ Error GameSingleton::load_defines_compatibility_mode(PackedStringArray const& fi
 		UtilityFunctions::push_error("Failed to hardcoded defines!");
 		err = FAILED;
 	}
-	if (!dataloader.load_localisation_files(LoadLocalisation::add_message)) {
+	auto add_message = std::bind_front(&LoadLocalisation::add_message, LoadLocalisation::get_singleton());
+	if (!dataloader.load_localisation_files(add_message)) {
 		UtilityFunctions::push_error("Failed to load localisation!");
 		err = FAILED;
 	}

extension/src/openvic-extension/singletons/LoadLocalisation.cpp

@@ -135,7 +135,6 @@ Error LoadLocalisation::load_localisation_dir(String const& dir_path) const {
 	return err;
 }
 bool LoadLocalisation::add_message(std::string_view key, Dataloader::locale_t locale, std::string_view localisation) {
-	static Ref<Translation> translations[Dataloader::_LocaleCount] = { nullptr };
 	Ref<Translation>& translation = translations[locale];
 	if (translation.is_null()) {
 		translation = _singleton->_get_translation(Dataloader::locale_names[locale]);

extension/src/openvic-extension/singletons/LoadLocalisation.hpp

@@ -10,6 +10,8 @@ namespace OpenVic {
 
 		static inline LoadLocalisation* _singleton = nullptr;
 
+		godot::Ref<godot::Translation> translations[Dataloader::_LocaleCount];
+
 		godot::Error _load_file(godot::String const& file_path, godot::Ref<godot::Translation> translation) const;
 		godot::Ref<godot::Translation> _get_translation(godot::String const& locale) const;
 
@@ -26,6 +28,6 @@ namespace OpenVic {
 		godot::Error load_locale_dir(godot::String const& dir_path, godot::String const& locale) const;
 		godot::Error load_localisation_dir(godot::String const& dir_path) const;
 
-		static bool add_message(std::string_view key, Dataloader::locale_t locale, std::string_view localisation);
+		bool add_message(std::string_view key, Dataloader::locale_t locale, std::string_view localisation);
 	};
 }

game/bin/openvic.gdextension

@@ -1,7 +1,8 @@
 [configuration]
 
 entry_symbol = "openvic_library_init"
-compatibility_minimum = 4.1
+compatibility_minimum = 4.2
+reloadable = true
 
 [libraries]
 

game/project.godot

@@ -14,7 +14,7 @@ config/name="OpenVic"
 config/description="A faithful recreation of Victoria 2: Heart of Darkness with a focus on enhancing performance, multiplayer stability, and modability for modern machines."
 run/main_scene="res://src/Game/GameStart.tscn"
 config/use_custom_user_dir=true
-config/features=PackedStringArray("4.1", "Forward Plus")
+config/features=PackedStringArray("4.2", "Forward Plus")
 boot_splash/bg_color=Color(0, 0, 0, 0)
 boot_splash/show_image=false
 boot_splash/image="res://splash_assets/splash_image.png"