zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use translation slot 0 for reserved content, like font translations.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 19:11:20 +02:00
parent 2dcf63c57d
commit 32300f7d26
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/common/engine/palettecontainer.h
View file

@ -6,6 +6,12 @@
class FileReader; class FileReader;
enum
{
TRANSLATION_Internal = 0
};
struct FRemapTable struct FRemapTable
{ {
FRemapTable(int count = 256) { NumEntries = count; } FRemapTable(int count = 256) { NumEntries = count; }
@ -84,9 +90,10 @@ public:
FRemapTable IceMap; // This is used by the texture compositor so it must be globally accessible. FRemapTable IceMap; // This is used by the texture compositor so it must be globally accessible.
uint8_t GrayMap[256]; uint8_t GrayMap[256];
TArray<FRemapTable*> uniqueRemaps;
private: private:
FMemArena remapArena; FMemArena remapArena;
TArray<FRemapTable*> uniqueRemaps;
TArray<TAutoGrowArray<FRemapTablePtr, FRemapTable*>> TranslationTables; TArray<TAutoGrowArray<FRemapTablePtr, FRemapTable*>> TranslationTables;
public: public:
void Init(int numslots); // This cannot be a constructor!!! void Init(int numslots); // This cannot be a constructor!!!

2
src/gamedata/fonts/font.cpp
View file

@ -664,7 +664,7 @@ void FFont::SetDefaultTranslation(uint32_t *othercolors)
} }
} }
} }
Translations[CR_UNTRANSLATED] = GPalette.StoreTranslation(TRANSLATION_Font, &remap); Translations[CR_UNTRANSLATED] = GPalette.StoreTranslation(TRANSLATION_Internal, &remap);
forceremap = true; forceremap = true;
} }

2
src/gamedata/fonts/hexfont.cpp
View file

@ -418,7 +418,7 @@ public:
} }
} }
} }
Translations[CR_UNTRANSLATED] = GPalette.StoreTranslation(TRANSLATION_Font, &remap); Translations[CR_UNTRANSLATED] = GPalette.StoreTranslation(TRANSLATION_Internal, &remap);
forceremap = true; forceremap = true;
} }

4
src/r_data/r_translate.h
View file

@ -9,8 +9,7 @@ class FSerializer;
enum enum
{ {
TRANSLATION_Invalid, TRANSLATION_Players = 1,
TRANSLATION_Players,
TRANSLATION_PlayersExtra, TRANSLATION_PlayersExtra,
TRANSLATION_Standard, TRANSLATION_Standard,
TRANSLATION_LevelScripted, TRANSLATION_LevelScripted,
@ -20,7 +19,6 @@ enum
TRANSLATION_Blood, TRANSLATION_Blood,
TRANSLATION_RainPillar, TRANSLATION_RainPillar,
TRANSLATION_Custom, TRANSLATION_Custom,
TRANSLATION_Font,
NUM_TRANSLATION_TABLES NUM_TRANSLATION_TABLES
}; };

1
wadsrc/static/zscript/constants.zs
View file

@ -1047,7 +1047,6 @@ enum ETranslationTable
TRANSLATION_Blood, TRANSLATION_Blood,
TRANSLATION_RainPillar, TRANSLATION_RainPillar,
TRANSLATION_Custom, TRANSLATION_Custom,
TRANSLATION_Font,
}; };
enum EFindFloorCeiling enum EFindFloorCeiling