summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-10-14 23:52:53 +0200
committerAki <please@ignore.pl>2022-10-14 23:52:53 +0200
commit58581f2ac25b68b6dd08b2336514f679af40fb64 (patch)
tree803e5377a977933bdb85dba9004ea6f4cfe01101
parentc9cad4935e1fa1358ca443237f25c1308f66c90a (diff)
downloadstarshatter-58581f2ac25b68b6dd08b2336514f679af40fb64.zip
starshatter-58581f2ac25b68b6dd08b2336514f679af40fb64.tar.gz
starshatter-58581f2ac25b68b6dd08b2336514f679af40fb64.tar.bz2
Fixed ContentBundle loading locale at init
-rw-r--r--StarsEx/ContentBundle.cpp10
-rw-r--r--StarsEx/ContentBundle.h3
2 files changed, 3 insertions, 10 deletions
diff --git a/StarsEx/ContentBundle.cpp b/StarsEx/ContentBundle.cpp
index cd10893..99fee45 100644
--- a/StarsEx/ContentBundle.cpp
+++ b/StarsEx/ContentBundle.cpp
@@ -25,15 +25,9 @@ ContentBundle* ContentBundle::GetInstance()
// +--------------------------------------------------------------------+
-ContentBundle::ContentBundle() : ContentBundle("content", nullptr)
+ContentBundle::ContentBundle(Locale* locale)
{
-}
-
-// +--------------------------------------------------------------------+
-
-ContentBundle::ContentBundle(const char* bundle, Locale* locale)
-{
- Load(bundle, locale);
+ UseLocale(locale);
}
// +--------------------------------------------------------------------+
diff --git a/StarsEx/ContentBundle.h b/StarsEx/ContentBundle.h
index ffcc7e1..da2fb0d 100644
--- a/StarsEx/ContentBundle.h
+++ b/StarsEx/ContentBundle.h
@@ -28,8 +28,7 @@ public:
static ContentBundle* GetInstance();
- ContentBundle();
- ContentBundle(const char* bundle, Locale* locale);
+ explicit ContentBundle(Locale* locale=nullptr);
virtual ~ContentBundle();
bool Init();