mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-19 13:08:09 +00:00
final commit
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
|
||||
// 4J - TODO - properly implement
|
||||
|
||||
Language *Language::singleton = new Language();
|
||||
Language *Language::singleton = nullptr;
|
||||
|
||||
Language::Language()
|
||||
{
|
||||
@@ -11,6 +11,11 @@ Language::Language()
|
||||
|
||||
Language *Language::getInstance()
|
||||
{
|
||||
// 4jcraft, fixes static init fiassco in I18n.cpp
|
||||
if(singleton == nullptr) {
|
||||
singleton = new Language();
|
||||
}
|
||||
|
||||
return singleton;
|
||||
}
|
||||
|
||||
@@ -20,7 +25,8 @@ std::wstring Language::getElement(const std::wstring& elementId)
|
||||
return elementId;
|
||||
} */
|
||||
|
||||
std::wstring Language::getElement(const std::wstring& elementId, ...)
|
||||
// 4jcraft changed, again const reference into va_start, std forbids
|
||||
std::wstring Language::getElement(std::wstring elementId, ...)
|
||||
{
|
||||
#ifdef __PSVITA__ // 4J - vita doesn't like having a reference type as the last parameter passed to va_start - we shouldn't need this method anyway
|
||||
return L"";
|
||||
@@ -45,4 +51,4 @@ std::wstring Language::getElementName(const std::wstring& elementId)
|
||||
std::wstring Language::getElementDescription(const std::wstring& elementId)
|
||||
{
|
||||
return elementId;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user