mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
text declarations go into text.h
This commit is contained in:
committed by
majcosta
parent
54bdce6c46
commit
15821498a3
@@ -32,14 +32,6 @@ namespace Loc
|
|||||||
|
|
||||||
#include "Text.h"
|
#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
|
// 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
|
// body, so they resolve to the pointer globals in Text.h/LanguageStrings.cpp -- rebound to
|
||||||
|
|||||||
@@ -3208,6 +3208,12 @@ enum {
|
|||||||
#define TACTICAL_INVENTORY_DIALOG_NUM 16
|
#define TACTICAL_INVENTORY_DIALOG_NUM 16
|
||||||
#define TACTICAL_COVER_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
|
// Enumeration support
|
||||||
typedef struct Str8EnumLookupType {
|
typedef struct Str8EnumLookupType {
|
||||||
int value;
|
int value;
|
||||||
|
|||||||
Reference in New Issue
Block a user