diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2020-06-29 09:37:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 09:37:53 +0300 |
| commit | 860f75d66ce51f2f5f3ea2b4b2b582f6d161a2bb (patch) | |
| tree | 6a8f83b0d46e97b198f095b7624deecca75051e7 /src/text/Text.cpp | |
| parent | 1f1782c587600abef2bc3e77b4d126424dbd022d (diff) | |
| parent | 209b7891d10f93754540114de34b0e4734c26630 (diff) | |
Merge branch 'master' into ps2menu
Diffstat (limited to 'src/text/Text.cpp')
| -rw-r--r-- | src/text/Text.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/text/Text.cpp b/src/text/Text.cpp index 926ccd1c..c9e22a84 100644 --- a/src/text/Text.cpp +++ b/src/text/Text.cpp @@ -97,7 +97,11 @@ CText::Unload(void) wchar* CText::Get(const char *key) { +#ifdef FIX_BUGS + return keyArray.Search(key, data.chars); +#else return keyArray.Search(key); +#endif } wchar UpperCaseTable[128] = { @@ -196,9 +200,11 @@ CKeyArray::Unload(void) void CKeyArray::Update(wchar *chars) { +#ifndef FIX_BUGS int i; for(i = 0; i < numEntries; i++) entries[i].value = (wchar*)((uint8*)chars + (uintptr)entries[i].value); +#endif } CKeyEntry* @@ -222,15 +228,25 @@ CKeyArray::BinarySearch(const char *key, CKeyEntry *entries, int16 low, int16 hi } wchar* +#ifdef FIX_BUGS +CKeyArray::Search(const char *key, wchar *data) +#else CKeyArray::Search(const char *key) +#endif { CKeyEntry *found; char errstr[25]; int i; +#ifdef FIX_BUGS + found = BinarySearch(key, entries, 0, numEntries-1); + if(found) + return (wchar*)((uint8*)data + found->valueOffset); +#else found = BinarySearch(key, entries, 0, numEntries-1); if(found) return found->value; +#endif sprintf(errstr, "%s missing", key); for(i = 0; i < 25; i++) WideErrorString[i] = errstr[i]; |