mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 05:51:20 +00:00
- handle Build tiles via explicit callback to the init function.
This commit is contained in:
parent
8aaab153fa
commit
f63d4d8a12
3 changed files with 6 additions and 6 deletions
|
@ -1183,7 +1183,6 @@ void FTextureManager::AddLocalizedVariants()
|
|||
//
|
||||
//==========================================================================
|
||||
FGameTexture *CreateShaderTexture(bool, bool);
|
||||
void InitBuildTiles();
|
||||
FImageSource* CreateEmptyTexture();
|
||||
|
||||
void FTextureManager::Init()
|
||||
|
@ -1213,7 +1212,7 @@ void FTextureManager::Init()
|
|||
AddGameTexture(mt);
|
||||
}
|
||||
|
||||
void FTextureManager::AddTextures(void (*progressFunc_)(), void (*checkForHacks)(BuildInfo&))
|
||||
void FTextureManager::AddTextures(void (*progressFunc_)(), void (*checkForHacks)(BuildInfo&), void (*customtexturehandler)())
|
||||
{
|
||||
progressFunc = progressFunc_;
|
||||
//if (BuildTileFiles.Size() == 0) CountBuildTiles ();
|
||||
|
@ -1229,9 +1228,9 @@ void FTextureManager::AddTextures(void (*progressFunc_)(), void (*checkForHacks)
|
|||
build.ResolveAllPatches();
|
||||
|
||||
// Add one marker so that the last WAD is easier to handle and treat
|
||||
// Build tiles as a completely separate block.
|
||||
// custom textures as a completely separate block.
|
||||
FirstTextureForFile.Push(Textures.Size());
|
||||
InitBuildTiles ();
|
||||
if (customtexturehandler) customtexturehandler();
|
||||
FirstTextureForFile.Push(Textures.Size());
|
||||
|
||||
DefaultTexture = CheckForTexture ("-NOFLAT-", ETextureType::Override, 0);
|
||||
|
|
|
@ -124,7 +124,7 @@ public:
|
|||
void LoadTextureX(int wadnum, FMultipatchTextureBuilder &build);
|
||||
void AddTexturesForWad(int wadnum, FMultipatchTextureBuilder &build);
|
||||
void Init();
|
||||
void AddTextures(void (*progressFunc_)(), void (*checkForHacks)(BuildInfo&));
|
||||
void AddTextures(void (*progressFunc_)(), void (*checkForHacks)(BuildInfo&), void (*customtexturehandler)() = nullptr);
|
||||
void DeleteAll();
|
||||
|
||||
void ReplaceTexture (FTextureID picnum, FGameTexture *newtexture, bool free);
|
||||
|
|
|
@ -176,6 +176,7 @@ void I_UpdateWindowTitle();
|
|||
void S_ParseMusInfo();
|
||||
void D_GrabCVarDefaults();
|
||||
void LoadHexFont(const char* filename);
|
||||
void InitBuildTiles();
|
||||
|
||||
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
|
||||
|
||||
|
@ -3211,7 +3212,7 @@ static int D_InitGame(const FIWADInfo* iwad_info, TArray<FString>& allwads, TArr
|
|||
{
|
||||
StartWindow->Progress();
|
||||
if (StartScreen) StartScreen->Progress(1);
|
||||
}, CheckForHacks);
|
||||
}, CheckForHacks, InitBuildTiles);
|
||||
PatchTextures();
|
||||
TexAnim.Init();
|
||||
C_InitConback(TexMan.CheckForTexture(gameinfo.BorderFlat, ETextureType::Flat), true, 0.25);
|
||||
|
|
Loading…
Reference in a new issue