From 15821498a33c60b718ebe1f8b9ab1bbdc11b0ce0 Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Tue, 21 Jul 2026 16:56:30 -0300 Subject: [PATCH] text declarations go into text.h --- i18n/ExportStrings.cpp | 8 -------- i18n/include/Text.h | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/i18n/ExportStrings.cpp b/i18n/ExportStrings.cpp index 58948b56..7477d6da 100644 --- a/i18n/ExportStrings.cpp +++ b/i18n/ExportStrings.cpp @@ -32,14 +32,6 @@ namespace Loc #include "Text.h" -// Declared only as bare externs at their call sites (Ja2/, Strategic/) -- the same -// escapees the C10 header sweep and Cn+1 residue (docs/plans/language-design.md) missed -// because Text.h never declared them. This TU needs them too. -extern STR16* gzIntroScreen; -extern STR16* pBullseyeStrings; -extern STR16* pContractButtonString; -extern STR16* pUpdatePanelButtons; -extern STR16* sRepairsDoneString; // Table symbols below (Loc::pTownNames etc.) are unqualified inside Loc::ExportStrings's // body, so they resolve to the pointer globals in Text.h/LanguageStrings.cpp -- rebound to diff --git a/i18n/include/Text.h b/i18n/include/Text.h index 72bcae29..f2bf3366 100644 --- a/i18n/include/Text.h +++ b/i18n/include/Text.h @@ -3208,6 +3208,12 @@ enum { #define TACTICAL_INVENTORY_DIALOG_NUM 16 #define TACTICAL_COVER_DIALOG_NUM 16 +extern STR16* gzIntroScreen; +extern STR16* pBullseyeStrings; +extern STR16* pContractButtonString; +extern STR16* pUpdatePanelButtons; +extern STR16* sRepairsDoneString; + // Enumeration support typedef struct Str8EnumLookupType { int value;