AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 07:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

Browse Source
This commit is contained in:
Phillip Stephens
2017-01-26 02:06:41 -08:00
parent 0f3e4b4a38 d6482874d6
commit bcc524e084
7 changed files with 280 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/GuiSys/CTextParser.cpp
View File

@@ -7,12 +7,12 @@ namespace urde
static float u16stof(char16_t* str)
{
wchar_t wstr[16];
char cstr[16];
int i;
for (i=0 ; i<15 && str[i] != u'\0' ; ++i)
wstr[i] = str[i];
wstr[i+1] = L'\0';
return std::wcstof(wstr, nullptr);
cstr[i] = str[i];
cstr[i] = '\0';
return strtof(cstr, nullptr);
}
CTextColor CTextParser::ParseColor(const char16_t* str, int len)
@@ -325,7 +325,7 @@ void CTextParser::ParseText(CTextExecuteBuffer& out, const char16_t* str, int le
while (str[e] && (len == -1 || e < len) && str[e] != u';')
++e;
ParseTag(out, str + e, e - b);
ParseTag(out, str + b, e - b);
b = e + 1;
}
else