diff options
Diffstat (limited to 'StarsEx')
-rw-r--r-- | StarsEx/ContentBundle.cpp | 10 | ||||
-rw-r--r-- | StarsEx/ContentBundle.h | 3 |
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(); |