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>
88 lines
2.7 KiB
C
88 lines
2.7 KiB
C
#ifndef _JA25ENGLISHTEXT__H_
|
|
#define _JA25ENGLISHTEXT__H_
|
|
|
|
extern STR16* gzIMPSkillTraitsText;
|
|
|
|
////////////////////////////////////////////////////////
|
|
// added by SANDRO
|
|
extern STR16* gzIMPSkillTraitsTextNewMajor;
|
|
extern STR16* gzIMPSkillTraitsTextNewMinor;
|
|
|
|
extern STR16* gzIMPMajorTraitsHelpTextsAutoWeapons;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsHeavyWeapons;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsSniper;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsRanger;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsGunslinger;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsMartialArts;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsSquadleader;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsTechnician;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsDoctor;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsCovertOps; // added by Flugente
|
|
extern STR16* gzIMPMajorTraitsHelpTextsRadioOperator; // added by Flugente
|
|
extern STR16* gzIMPMajorTraitsHelpTextsNone;
|
|
|
|
extern STR16* gzIMPMinorTraitsHelpTextsAmbidextrous;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsMelee;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsThrowing;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsStealthy;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsNightOps;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsAthletics;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsBodybuilding;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsDemolitions;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsTeaching;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsScouting;
|
|
extern STR16* gzIMPMinorTraitsHelpTextsSnitch;
|
|
extern STR16* gzIMPMajorTraitsHelpTextsSurvival; // added by Flugente
|
|
extern STR16* gzIMPMinorTraitsHelpTextsNone;
|
|
|
|
extern STR16* gzIMPOldSkillTraitsHelpTexts;
|
|
|
|
extern STR16* gzIMPNewCharacterTraitsHelpTexts;
|
|
|
|
extern STR16* gzIMPDisabilitiesHelpTexts;
|
|
|
|
extern STR16* gzIMPProfileCostText;
|
|
|
|
extern STR16* zGioNewTraitsImpossibleText;
|
|
///////////////////////////////////////////////////////
|
|
|
|
enum
|
|
{
|
|
IMM__IRON_MAN_MODE_WARNING_TEXT,
|
|
IMM__SOFT_IRON_MAN_MODE_WARNING_TEXT,
|
|
IMM__EXTREME_IRON_MAN_MODE_WARNING_TEXT,
|
|
};
|
|
extern STR16* gzIronManModeWarningText;
|
|
|
|
// display cover message (for tactical usually, seperated)
|
|
// display cover terrain type info (used in cover information)
|
|
enum
|
|
{
|
|
DC_MSG__COVER_INFORMATION,
|
|
DC_MSG__GUN_RANGE_INFORMATION,
|
|
DC_MSG__NCTH_GUN_RANGE_INFORMATION,
|
|
DC_MSG__COVER_DRAW_OFF,
|
|
DC_MSG__COVER_DRAW_MERC_VIEW,
|
|
DC_MSG__COVER_DRAW_ENEMY_VIEW,
|
|
DC_TTI__WOOD,
|
|
DC_TTI__URBAN,
|
|
DC_TTI__DESERT,
|
|
DC_TTI__SNOW,
|
|
DC_TTI__WOOD_AND_DESERT,
|
|
DC_TTI__WOOD_AND_URBAN,
|
|
DC_TTI__WOOD_AND_SNOW,
|
|
DC_TTI__DESERT_AND_URBAN,
|
|
DC_TTI__DESERT_AND_SNOW,
|
|
DC_TTI__URBAN_AND_SNOW,
|
|
DC_TTI__UNKNOWN,
|
|
DC_MSG__COVER_INFORMATION_WITH_DETAILED_CAMO,
|
|
DC_TTI__DETAILED_SOUND,
|
|
DC_TTI__DETAILED_STEALTH,
|
|
DC_TTI__DETAILED_TRAP_LEVEL,
|
|
};
|
|
extern STR16* gzDisplayCoverText;
|
|
|
|
#endif
|
|
|
|
|