zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-21 19:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

- put texture ID lists into a namespace.

Browse source 
These conflicted with each other.
This commit is contained in:
Christoph Oelckers 2023-05-01 12:32:00 +02:00
parent d6a7721802
commit 481f139962
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/games/blood/src/texids.h
View file

@ -1,6 +1,9 @@
#pragma once #pragma once
#include "ns.h"
#include "textureid.h" #include "textureid.h"
BEGIN_BLD_NS
#define x(a) kTex##a, #define x(a) kTex##a,
enum ETextureIDs enum ETextureIDs
@ -27,4 +30,6 @@ inline void InitTextureIDs()
{ {
aTexIds[i] = TexMan.CheckForTexture(texlistnames[i], ETextureType::Any); aTexIds[i] = TexMan.CheckForTexture(texlistnames[i], ETextureType::Any);
} }
} }
END_BLD_NS

7
source/games/exhumed/src/texids.h
View file

@ -1,6 +1,9 @@
#pragma once #pragma once
#include "ns.h"
#include "textureid.h" #include "textureid.h"
BEGIN_PS_NS
#define x(a) kTex##a, #define x(a) kTex##a,
enum ETextureIDs enum ETextureIDs
@ -27,4 +30,6 @@ inline void InitTextureIDs()
{ {
aTexIds[i] = TexMan.CheckForTexture(texlistnames[i], ETextureType::Any); aTexIds[i] = TexMan.CheckForTexture(texlistnames[i], ETextureType::Any);
} }
} }
END_PS_NS