zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-18 22:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed titlepic animation.

Browse source 
It needed more than using the animated accessor. The code here nearly went out of its way to circumvent the texture manager's built in logic.

(cherry picked from commit 79b3c41677)
This commit is contained in:
Christoph Oelckers 2018-07-15 22:51:25 +02:00 committed by drfrag666
parent 8420459aa0
commit d36c839475
2 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/d_main.cpp
View file

@ -243,8 +243,8 @@ int eventhead;
int eventtail;
gamestate_t wipegamestate = GS_DEMOSCREEN; // can be -1 to force a wipe
bool PageBlank;
FTexture *Page;
FTexture *Advisory;
FTextureID Page;
bool nospriterename;
FStartupInfo DoomStartupInfo;
FString lastIWAD;
@ -1035,7 +1035,8 @@ void D_DoomLoop ()
// Clamp the timer to TICRATE until the playloop has been entered.
r_NoInterpolate = true;
Page = Advisory = NULL;
Page.SetInvalid();
Advisory = nullptr;
vid_cursor.Callback();
@ -1120,9 +1121,9 @@ void D_PageTicker (void)
void D_PageDrawer (void)
{
screen->Clear(0, 0, SCREENWIDTH, SCREENHEIGHT, 0, 0);
if (Page != NULL)
if (Page.Exists())
{
screen->DrawTexture (Page, 0, 0,
screen->DrawTexture (TexMan(Page), 0, 0,
DTA_Fullscreen, true,
DTA_Masked, false,
DTA_BilinearFilter, true,
@ -1264,18 +1265,7 @@ void D_DoStrifeAdvanceDemo ()
if (demosequence == 9 && !(gameinfo.flags & GI_SHAREWARE))
demosequence = 10;
if (pagename)
{
if (Page != NULL)
{
Page->Unload ();
Page = NULL;
}
if (pagename[0])
{
Page = TexMan[pagename];
}
}
if (pagename != nullptr) Page = TexMan.CheckForTexture(pagename, ETextureType::MiscPatch);
}
//==========================================================================
@ -1374,13 +1364,10 @@ void D_DoAdvanceDemo (void)
break;
}
if (pagename.IsNotEmpty())
{
if (Page != NULL)
{
Page->Unload ();
}
Page = TexMan(pagename);
Page = TexMan.CheckForTexture(pagename, ETextureType::MiscPatch);
}
}

10
src/g_game.cpp
View file

@ -1037,9 +1037,6 @@ bool G_Responder (event_t *ev)
// G_Ticker
// Make ticcmd_ts for the players.
//
extern FTexture *Page;
void G_Ticker ()
{
int i;
@ -1141,12 +1138,7 @@ void G_Ticker ()
if (oldgamestate != gamestate)
{
if (oldgamestate == GS_DEMOSCREEN && Page != NULL)
{
Page->Unload();
Page = NULL;
}
else if (oldgamestate == GS_FINALE)
if (oldgamestate == GS_FINALE)
{
F_EndFinale ();
}