summaryrefslogtreecommitdiffstats
path: root/src/text
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-01-13 12:22:31 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2021-01-13 12:22:31 +0100
commit57201187de74da42437dfa984a6cd36fe663a5e4 (patch)
tree303a3e4ab297c1dcf0cb81236f012db96ac5f78d /src/text
parentMake cmake files more generic (diff)
downloadre3-57201187de74da42437dfa984a6cd36fe663a5e4.tar
re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.gz
re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.bz2
re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.lz
re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.xz
re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.zst
re3-57201187de74da42437dfa984a6cd36fe663a5e4.zip
Diffstat (limited to '')
-rw-r--r--src/text/Text.cpp8
-rw-r--r--src/text/Text.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index 0c63ced7..fe37d0f1 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -97,7 +97,7 @@ CText::Unload(void)
wchar*
CText::Get(const char *key)
{
-#ifdef FIX_BUGS
+#if defined (FIX_BUGS) || defined(FIX_BUGS_64)
return keyArray.Search(key, data.chars);
#else
return keyArray.Search(key);
@@ -201,7 +201,7 @@ CKeyArray::Unload(void)
void
CKeyArray::Update(wchar *chars)
{
-#ifndef FIX_BUGS
+#if !defined(FIX_BUGS) && !defined(FIX_BUGS_64)
int i;
for(i = 0; i < numEntries; i++)
entries[i].value = (wchar*)((uint8*)chars + (uintptr)entries[i].value);
@@ -229,7 +229,7 @@ CKeyArray::BinarySearch(const char *key, CKeyEntry *entries, int16 low, int16 hi
}
wchar*
-#ifdef FIX_BUGS
+#if defined (FIX_BUGS) || defined(FIX_BUGS_64)
CKeyArray::Search(const char *key, wchar *data)
#else
CKeyArray::Search(const char *key)
@@ -239,7 +239,7 @@ CKeyArray::Search(const char *key)
char errstr[25];
int i;
-#ifdef FIX_BUGS
+#if defined (FIX_BUGS) || defined(FIX_BUGS_64)
found = BinarySearch(key, entries, 0, numEntries-1);
if(found)
return (wchar*)((uint8*)data + found->valueOffset);
diff --git a/src/text/Text.h b/src/text/Text.h
index ed978a8b..ab6d1809 100644
--- a/src/text/Text.h
+++ b/src/text/Text.h
@@ -7,7 +7,7 @@ void TextCopy(wchar *dst, const wchar *src);
struct CKeyEntry
{
-#ifdef FIX_BUGS
+#if defined(FIX_BUGS) || defined(FIX_BUGS_64)
uint32 valueOffset;
#else
wchar *value;
@@ -30,7 +30,7 @@ public:
void Unload(void);
void Update(wchar *chars);
CKeyEntry *BinarySearch(const char *key, CKeyEntry *entries, int16 low, int16 high);
-#ifdef FIX_BUGS
+#if defined (FIX_BUGS) || defined(FIX_BUGS_64)
wchar *Search(const char *key, wchar *data);
#else
wchar *Search(const char *key);