summaryrefslogtreecommitdiffstats
path: root/src/text
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-13 13:56:25 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-13 13:56:25 +0100
commitff057838ec8f2f03b6990a87ca30e85ca45daafb (patch)
tree38af6623091aed50390109799d7f8b0ea28d2224 /src/text
parentMerge remote-tracking branch 'origin/miami' into lcs (diff)
parentFix backface culling of cutscene objects (diff)
downloadre3-ff057838ec8f2f03b6990a87ca30e85ca45daafb.tar
re3-ff057838ec8f2f03b6990a87ca30e85ca45daafb.tar.gz
re3-ff057838ec8f2f03b6990a87ca30e85ca45daafb.tar.bz2
re3-ff057838ec8f2f03b6990a87ca30e85ca45daafb.tar.lz
re3-ff057838ec8f2f03b6990a87ca30e85ca45daafb.tar.xz
re3-ff057838ec8f2f03b6990a87ca30e85ca45daafb.tar.zst
re3-ff057838ec8f2f03b6990a87ca30e85ca45daafb.zip
Diffstat (limited to 'src/text')
-rw-r--r--src/text/Text.cpp10
-rw-r--r--src/text/Text.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index fd1659dc..efb8b2a9 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -113,14 +113,14 @@ wchar*
CText::Get(const char *key)
{
uint8 result = false;
-#ifdef FIX_BUGS
+#if defined (FIX_BUGS) || defined(FIX_BUGS_64)
wchar *outstr = keyArray.Search(key, data.chars, &result);
#else
wchar *outstr = keyArray.Search(key, &result);
#endif
if (!result && bHasMissionTextOffsets && bIsMissionTextLoaded)
-#ifdef FIX_BUGS
+#if defined (FIX_BUGS) || defined(FIX_BUGS_64)
outstr = mission_keyArray.Search(key, mission_data.chars, &result);
#else
outstr = mission_keyArray.Search(key, &result);
@@ -347,7 +347,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);
@@ -375,7 +375,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, uint8 *result)
#else
CKeyArray::Search(const char *key, uint8 *result)
@@ -385,7 +385,7 @@ CKeyArray::Search(const char *key, uint8 *result)
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) {
*result = true;
diff --git a/src/text/Text.h b/src/text/Text.h
index 3e11ea46..05387346 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, uint8 *result);
#else
wchar *Search(const char *key, uint8* result);