RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-08-05 00:14:31 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: RomanRom2:0163d91543a2cefefc7ba4cf7595e64dbf1a60ec
Branches Tags
RomanRom2:master
..
compare: RomanRom2:74bc963a1c3c586a8960e6be937ca5713746bf77
Branches Tags
RomanRom2:master

No commits in common. "0163d91543a2cefefc7ba4cf7595e64dbf1a60ec" and "74bc963a1c3c586a8960e6be937ca5713746bf77" have entirely different histories.
0163d91543 ... 74bc963a1c

1 changed files with 9 additions and 9 deletions
Show Stats Expand all files Collapse all files

18
src/util/StringTo.cpp
View File

@ -112,12 +112,12 @@ bool StringToBOOL(lua_State* L, int32_t idx, int32_t def) {
} }
int32_t StringToDrawLayer(const char* string, int32_t& layer) { int32_t StringToDrawLayer(const char* string, int32_t& layer) {
struct LayerEntry { struct drawlayer {
int32_t layer; int32_t layer;
const char* string; const char* string;
}; };
static LayerEntry layerMap[] = { static drawlayer array_drawlayer[5] = {
{ 0, "BACKGROUND" }, { 0, "BACKGROUND" },
{ 1, "BORDER" }, { 1, "BORDER" },
{ 2, "ARTWORK" }, { 2, "ARTWORK" },
@ -125,9 +125,9 @@ int32_t StringToDrawLayer(const char* string, int32_t& layer) {
{ 4, "HIGHLIGHT" } { 4, "HIGHLIGHT" }
}; };
for (const auto& entry : layerMap) { for (int32_t i = 0; i < 5; i++) {
if (!SStrCmpI(entry.string, string)) { if (!SStrCmpI(array_drawlayer[i].string, string, 0x7FFFFFFFu)) {
layer = entry.layer; layer = array_drawlayer[i].layer;
return 1; return 1;
} }
} }
@ -141,7 +141,7 @@ int32_t StringToJustify(const char* string, uint32_t& justify) {
const char* string; const char* string;
}; };
static JustifyEntry justifyMap[] = { static JustifyEntry justifyMap[6] = {
{ 0x1, "LEFT" }, { 0x1, "LEFT" },
{ 0x2, "CENTER" }, { 0x2, "CENTER" },
{ 0x4, "RIGHT" }, { 0x4, "RIGHT" },
@ -150,9 +150,9 @@ int32_t StringToJustify(const char* string, uint32_t& justify) {
{ 0x20, "BOTTOM" } { 0x20, "BOTTOM" }
}; };
for (const auto& entry : justifyMap) { for (int32_t i = 0; i < 5; i++) {
if (!SStrCmpI(entry.string, string)) { if (!SStrCmpI(justifyMap[i].string, string, 0x7FFFFFFFu)) {
justify = entry.value; justify = justifyMap[i].value;
return 1; return 1;
} }
} }