TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move Text_string to dsx

Browse source
This commit is contained in:
Kp 2020-02-11 04:48:14 +00:00
parent bcf06623a5
commit 88087fbbab
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/main/text.h
View file

@ -1280,10 +1280,6 @@ void decode_text(char *text, int len); // decryption for briefings, etc.
#ifdef dsx
namespace dsx {
void load_text(void);
}
#endif
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
#ifndef USE_BUILTIN_ENGLISH_TEXT_STRINGS
//Array of pointers to text
extern array<const char *, N_TEXT_STRINGS> Text_string;
@ -1300,6 +1296,7 @@ static inline const char *dxx_gettext(unsigned expr, const char *fmt)
return Text_string[expr];
#endif
}
}
#endif
#endif

8
similar/main/text.cpp
View file

@ -52,8 +52,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
static std::unique_ptr<char[]> text;
static std::unique_ptr<char[]> overwritten_text;
array<const char *, N_TEXT_STRINGS> Text_string;
// rotates a byte left one bit, preserving the bit falling off the right
static void encode_rotate_left(char *c)
{
@ -92,6 +90,12 @@ void decode_text(char *buf, int len)
//load all the text strings for Descent
namespace dsx {
#ifdef USE_BUILTIN_ENGLISH_TEXT_STRINGS
static
#endif
array<const char *, N_TEXT_STRINGS> Text_string;
void load_text()
{
int len,i, have_binary = 0;