mirror of
https://github.com/ZDoom/Raze.git
synced 2025-02-20 18:42:26 +00:00
- put texture ID lists into a namespace.
These conflicted with each other.
This commit is contained in:
parent
d6a7721802
commit
481f139962
2 changed files with 12 additions and 2 deletions
|
@ -1,6 +1,9 @@
|
|||
#pragma once
|
||||
#include "ns.h"
|
||||
#include "textureid.h"
|
||||
|
||||
|
||||
BEGIN_BLD_NS
|
||||
#define x(a) kTex##a,
|
||||
|
||||
enum ETextureIDs
|
||||
|
@ -27,4 +30,6 @@ inline void InitTextureIDs()
|
|||
{
|
||||
aTexIds[i] = TexMan.CheckForTexture(texlistnames[i], ETextureType::Any);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
END_BLD_NS
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
#pragma once
|
||||
#include "ns.h"
|
||||
#include "textureid.h"
|
||||
|
||||
|
||||
BEGIN_PS_NS
|
||||
#define x(a) kTex##a,
|
||||
|
||||
enum ETextureIDs
|
||||
|
@ -27,4 +30,6 @@ inline void InitTextureIDs()
|
|||
{
|
||||
aTexIds[i] = TexMan.CheckForTexture(texlistnames[i], ETextureType::Any);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
END_PS_NS
|
||||
|
|
Loading…
Reference in a new issue