diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-13 14:56:25 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-13 14:56:25 +0200 |
| commit | ff057838ec8f2f03b6990a87ca30e85ca45daafb (patch) | |
| tree | 38af6623091aed50390109799d7f8b0ea28d2224 /src/text/Text.cpp | |
| parent | 94f25a429fb29eeaf6e7ccd21906ffcff45ebc38 (diff) | |
| parent | 0e9a44dd43441c081266665c74a150afa0386858 (diff) | |
Merge branch 'miami' into lcs
* miami:
Fix backface culling of cutscene objects
more renames
anim velocity union
rename m_vehEnterType -> m_vehDoor
Port cmake improvements to miami
some loose ends
move TODO to Readme
Fix build without FIX_BUGS, divide to 0 fixes
Diffstat (limited to 'src/text/Text.cpp')
| -rw-r--r-- | src/text/Text.cpp | 10 |
1 files changed, 5 insertions, 5 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; |