zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

-put the remaining directly accessed textures into the aTexIDs arrays for Blood and Exhumed.

Browse source
This commit is contained in:
Christoph Oelckers 2023-05-01 12:42:34 +02:00
parent 481f139962
commit ff24711710
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/games/blood/src/blood.cpp
View file

@ -496,8 +496,7 @@ void GameInterface::Ticker()
void GameInterface::DrawBackground()
{
twod->ClearScreen();
auto tex = TexMan.CheckForTexture("titlescreen", ETextureType::Any);
DrawTexture(twod, TexMan.GetGameTexture(tex), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, TAG_DONE);
DrawTexture(twod, TexMan.GetGameTexture(aTexIds[kTexTitlescreen]), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, TAG_DONE);
}
@ -598,7 +597,7 @@ void GameInterface::app_init()
levelLoadDefaults();
//---------
C_InitConback(TexMan.CheckForTexture("BACKTILE", ETextureType::Any), true, 0.25);
C_InitConback(aTexIds[kTexBACKTILE], true, 0.25);
Printf(PRINT_NONOTIFY, "Initializing view subsystem\n");
viewInit();

2
source/games/blood/src/texidsdef.h
View file

@ -29,3 +29,5 @@ x(ROCKDEBRIS3)
x(ROCKDEBRIS4)
x(ROCKDEBRIS5)
x(ROCKDEBRIS6)
x(Titlescreen)
x(BACKTILE)

1
source/games/exhumed/src/exhumed.cpp
View file

@ -50,7 +50,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "interpolate.h"
#include "tilesetbuilder.h"
#include "psky.h"
#include "texids.h"
BEGIN_PS_NS

3
source/games/exhumed/src/exhumed.h
View file

@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "texturemanager.h"
#include "texinfo.h"
#include "player.h"
#include "texids.h"
BEGIN_PS_NS
@ -149,7 +150,7 @@ extern int bVanilla;
inline FTextureID GameLogo()
{
return TexMan.CheckForTexture((g_gameType & GAMEFLAG_EXHUMED) ? "ExhumedLogo" : "PowerslaveLogo", ETextureType::Any);
return aTexIds[(g_gameType & GAMEFLAG_EXHUMED) ? kTexExhumedLogo : kTexPowerslaveLogo];
}
extern double g_frameDelay;

1
source/games/exhumed/src/object.cpp
View file

@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "interpolate.h"
#include "mapinfo.h"
#include "texids.h"
#include <string.h>
#include <assert.h>

3
source/games/exhumed/src/texidsdef.h
View file

@ -24,4 +24,5 @@ x(WeaponSpriteM60)
x(WeaponSpriteFlamethrower)
x(AmmoSpriteGrenade)
x(WeaponSpriteCobra)
x(ExhumedLogo)
x(PowerslaveLogo)