aboutsummaryrefslogtreecommitdiff
path: root/extension/src/openvic-extension/singletons
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2024-07-26 22:59:12 +0200
committer hop311 <hop3114@gmail.com>2024-07-26 22:59:12 +0200
commit164db4eb8f24e87755e02bae0e539f4f266e15b9 (patch)
tree9ab24e79d47c2c56dfd68ebf89e419d30324c92c /extension/src/openvic-extension/singletons
parent46c3009075be36577ab7dbea263655e428833b20 (diff)
Free removed child nodes + `godot::` cleanupfree-on-remove
Diffstat (limited to 'extension/src/openvic-extension/singletons')
-rw-r--r--extension/src/openvic-extension/singletons/Checksum.cpp4
-rw-r--r--extension/src/openvic-extension/singletons/GameSingleton.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/extension/src/openvic-extension/singletons/Checksum.cpp b/extension/src/openvic-extension/singletons/Checksum.cpp
index 9f48647..360f04c 100644
--- a/extension/src/openvic-extension/singletons/Checksum.cpp
+++ b/extension/src/openvic-extension/singletons/Checksum.cpp
@@ -29,6 +29,6 @@ Checksum::~Checksum() {
/* REQUIREMENTS:
* DAT-8
*/
-godot::String Checksum::get_checksum_text() {
- return godot::String("1234abcd");
+String Checksum::get_checksum_text() {
+ return String("1234abcd");
}
diff --git a/extension/src/openvic-extension/singletons/GameSingleton.cpp b/extension/src/openvic-extension/singletons/GameSingleton.cpp
index b6108ee..c1a811e 100644
--- a/extension/src/openvic-extension/singletons/GameSingleton.cpp
+++ b/extension/src/openvic-extension/singletons/GameSingleton.cpp
@@ -186,7 +186,7 @@ Ref<ImageTexture> GameSingleton::get_flag_sheet_texture() const {
return flag_sheet_texture;
}
-int32_t GameSingleton::get_flag_sheet_index(int32_t country_index, godot::StringName const& flag_type) const {
+int32_t GameSingleton::get_flag_sheet_index(int32_t country_index, StringName const& flag_type) const {
ERR_FAIL_COND_V_MSG(
country_index < 0 ||
country_index >= get_definition_manager().get_country_definition_manager().get_country_definition_count(),
@@ -207,7 +207,7 @@ Rect2i GameSingleton::get_flag_sheet_rect(int32_t flag_index) const {
return { Vector2i { flag_index % flag_sheet_dims.x, flag_index / flag_sheet_dims.x } * flag_dims, flag_dims };
}
-Rect2i GameSingleton::get_flag_sheet_rect(int32_t country_index, godot::StringName const& flag_type) const {
+Rect2i GameSingleton::get_flag_sheet_rect(int32_t country_index, StringName const& flag_type) const {
return get_flag_sheet_rect(get_flag_sheet_index(country_index, flag_type));
}