mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
fd2c74727e
squashed into a single commit because doing it in steps that all
compiled involved a lot of boilerplate that is pointless to commit to
the repository. GH still has the PR for reference.
g_lang, MAX_MESSAGES_ON_MAP_BOTTOM, and GetLanguagePrefix() were
compile-time constants selected by the ENGLISH/GERMAN/... build
define. They're now runtime, defaulting to the same per-exe value the
define used to pick, and overridable at startup from [Ja2 Settings]
LANGUAGE in Ja2.ini.
-
XMLTacticalMessages is filled at runtime from NewTacticalMessages.xml,
never from compiled-in per-language data: all 8 per-language definitions
were the identical all-zero { L"" }. Delete them and define one shared
buffer in Utils/XML_Language.cpp (the loader) instead of pointer-rebinding
it like the static tables — this drops 9 dead 800KB zero-buffers (8
namespaced copies in LanguageStrings.cpp plus the standalone one) and
leaves no bind-ordering hazard for the XML load path.
-
ExportStrings.cpp privately recompiled one language's full text table
by #including the raw _<LANG>Text.cpp inside namespace Loc, keyed off
the exe-level ENGLISH/GERMAN/... compile macro (whichever the build
happened to select). That's redundant with the pointer globals every
other subsystem already uses (Text.h / LanguageStrings.cpp).
Drop the private copy; the unqualified table names in Loc::ExportStrings
now resolve to the global pointer externs, which BindLanguageStrings has
already rebound to the runtime g_lang by the time this runs (EXPORT_STRINGS
ini flag, checked after GetRuntimeSettings in sgp.cpp). gs_Lang (used only
by Loc::Translate for the Polish/Russian byte remap on raw .edt exports) is
now derived from g_lang via ToLocLanguage, so the export always matches
whatever language is actually active instead of a compile-time pick.
-
Editor/popupmenu.cpp and Strategic/Scheduling.cpp kept their own
call-site extern of gszScheduleActions as CHAR16[NUM_SCHEDULE_ACTIONS][20]
after the real definition changed into a rebindable pointer
(CHAR16 (*)[20], LanguageStrings.cpp). MSVC decays the outer array
dimension when mangling globals, so both declarations produce the same
symbol (?gszScheduleActions@@3PAY0BE@_WA) and the mismatch linked
silently -- but the array-typed TUs then indexed the 4-byte pointer
slot itself as string data, so the editor schedule popup and the map
schedule message text read garbage.
-
add text.def to be single-source of truth on symbol names and use it
.much simpler, less error prone if adding more strings
-
add pseudo interface for language state. MAX_SAGES_ON_BOTTOM must always
change in lockstep with g_lang. this isn't foolproof but better
---------
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
149 lines
2.4 KiB
C
149 lines
2.4 KiB
C
#ifndef __IMP_TEXT_SYSTEM_H
|
|
#define __IMP_TEXT_SYSTEM_H
|
|
|
|
|
|
|
|
void LoadAndDisplayIMPText( INT16 sStartX, INT16 sStartY, INT16 sLineLength, INT16 sIMPTextRecordNumber, UINT32 uiFont, UINT8 ubColor, BOOLEAN fShadow, UINT32 uiFlags);
|
|
void InitializeImpRecordLengthList( void );
|
|
void PrintImpText( void );
|
|
void PrintIMPPersonalityQuizQuestionAndAnsers( void );
|
|
|
|
// buttons text
|
|
extern STR16* pImpButtonText;
|
|
|
|
|
|
// extra strings not found in IMP Text Document
|
|
extern STR16* pExtraIMPStrings;
|
|
|
|
extern STR16* pSkillTraitBeginIMPStrings; // added - SANDRO
|
|
|
|
enum{
|
|
IMP_HOME_1,
|
|
IMP_HOME_2,
|
|
IMP_HOME_3,
|
|
IMP_HOME_4,
|
|
IMP_HOME_5,
|
|
IMP_HOME_6,
|
|
IMP_HOME_7,
|
|
IMP_HOME_8,
|
|
IMP_HOME_9,
|
|
IMP_HOME_10,
|
|
IMP_ABOUT_US_1,
|
|
IMP_ABOUT_US_2,
|
|
IMP_ABOUT_US_3,
|
|
IMP_ABOUT_US_4,
|
|
IMP_ABOUT_US_5,
|
|
IMP_ABOUT_US_6,
|
|
IMP_ABOUT_US_7,
|
|
IMP_ABOUT_US_8,
|
|
IMP_ABOUT_US_9,
|
|
IMP_ABOUT_US_10,
|
|
IMP_ABOUT_US_11,
|
|
IMP_ABOUT_US_12,
|
|
IMP_MAIN_1,
|
|
IMP_MAIN_2,
|
|
IMP_MAIN_3,
|
|
IMP_MAIN_4,
|
|
IMP_MAIN_5,
|
|
IMP_MAIN_6,
|
|
IMP_MAIN_7,
|
|
IMP_MAIN_8,
|
|
IMP_MAIN_9,
|
|
IMP_BEGIN_1,
|
|
IMP_BEGIN_2,
|
|
IMP_BEGIN_3,
|
|
IMP_BEGIN_4,
|
|
IMP_BEGIN_5,
|
|
IMP_BEGIN_6,
|
|
IMP_BEGIN_7,
|
|
IMP_BEGIN_8,
|
|
IMP_BEGIN_9,
|
|
IMP_BEGIN_10,
|
|
IMP_BEGIN_11,
|
|
IMP_PERS_1,
|
|
IMP_PERS_2,
|
|
IMP_PERS_3,
|
|
IMP_PERS_4,
|
|
IMP_PERS_5,
|
|
IMP_PERS_6,
|
|
IMP_PERS_7,
|
|
IMP_PERS_8,
|
|
IMP_PERS_9,
|
|
IMP_PERS_10,
|
|
IMP_PERS_11,
|
|
IMP_PERS_12,
|
|
IMP_QUESTION_1,
|
|
IMP_PERS_F1 = IMP_QUESTION_1 + 90,
|
|
IMP_PERS_F2,
|
|
IMP_PERS_F3,
|
|
IMP_PERS_F4,
|
|
IMP_PERS_F5,
|
|
IMP_PERS_F6,
|
|
IMP_PERS_F7,
|
|
IMP_PERS_F8,
|
|
IMP_ATTRIB_1,
|
|
IMP_ATTRIB_2,
|
|
IMP_ATTRIB_3,
|
|
IMP_ATTRIB_4,
|
|
IMP_ATTRIB_5,
|
|
IMP_ATTRIB_6,
|
|
IMP_ATTRIB_7,
|
|
IMP_ATTRIB_8,
|
|
IMP_ATTRIB_SA_1,
|
|
IMP_ATTRIB_SA_2,
|
|
IMP_ATTRIB_SA_3,
|
|
IMP_ATTRIB_SA_4,
|
|
IMP_ATTRIB_SA_5,
|
|
IMP_ATTRIB_SA_6,
|
|
IMP_ATTRIB_SA_7,
|
|
IMP_ATTRIB_SA_8,
|
|
IMP_ATTRIB_SA_9,
|
|
IMP_ATTRIB_SA_10,
|
|
IMP_ATTRIB_SA_11,
|
|
IMP_ATTRIB_SA_12,
|
|
IMP_ATTRIB_SA_13,
|
|
IMP_ATTRIB_SA_14,
|
|
IMP_ATTRIB_SA_15,
|
|
IMP_ATTRIB_SA_16,
|
|
IMP_ATTRIB_SA_17,
|
|
IMP_ATTRIB_SA_18,
|
|
IMP_AF_1,
|
|
IMP_AF_2,
|
|
IMP_AF_3,
|
|
IMP_AF_4,
|
|
IMP_AF_5,
|
|
IMP_AF_6,
|
|
IMP_POR_1,
|
|
IMP_POR_2,
|
|
IMP_POR_3,
|
|
IMP_POR_4,
|
|
IMP_POR_5,
|
|
IMP_POR_6,
|
|
IMP_POR_7,
|
|
IMP_VOC_1,
|
|
IMP_VOC_2,
|
|
IMP_VOC_3,
|
|
IMP_VOC_4,
|
|
IMP_VOC_5,
|
|
IMP_VOC_6,
|
|
IMP_VOC_7,
|
|
IMP_FIN_1,
|
|
IMP_FIN_2,
|
|
IMP_FIN_3,
|
|
IMP_FIN_4,
|
|
IMP_FIN_5,
|
|
IMP_FIN_6,
|
|
IMP_FIN_7,
|
|
IMP_FIN_8,
|
|
IMP_FIN_9,
|
|
IMP_FIN_10,
|
|
IMP_CON_1 = IMP_FIN_10 - 1,
|
|
IMP_CON_2,
|
|
IMP_CON_3,
|
|
|
|
|
|
|
|
};
|
|
|
|
#endif
|