Set Texture* values at load time

This commit is contained in:
Kp 2013-11-17 00:42:28 +00:00
parent 4411532b6a
commit 1932647fb1
2 changed files with 5 additions and 9 deletions

View file

@ -210,10 +210,6 @@ void properties_read_cmp(PHYSFS_file * fp)
destroyed_exit_modelnum = PHYSFSX_readInt(fp);
#ifdef EDITOR
//Hardcoded flags
TextureMetals = 156;
TextureLights = 263;
TextureEffects = 327;
//Build tmaplist
Num_tmaps = 0;
for (i=0; i < TextureEffects; i++)

View file

@ -45,14 +45,14 @@ static UI_GADGET_USERBOX * TmapCurrent;
int CurrentTexture = 0; // Used globally
#if defined(DXX_BUILD_DESCENT_I)
#define DXX_TEXTURE_INITIALIZER(I) 0
#define DXX_TEXTURE_INITIALIZER(D1, D2) D1
#elif defined(DXX_BUILD_DESCENT_II)
#define DXX_TEXTURE_INITIALIZER(I) I
#define DXX_TEXTURE_INITIALIZER(D1, D2) D2
#endif
int TextureLights = DXX_TEXTURE_INITIALIZER(275);
int TextureEffects = DXX_TEXTURE_INITIALIZER(308);
int TextureMetals = DXX_TEXTURE_INITIALIZER(202);
int TextureLights = DXX_TEXTURE_INITIALIZER(263, 275);
int TextureEffects = DXX_TEXTURE_INITIALIZER(327, 308);
int TextureMetals = DXX_TEXTURE_INITIALIZER(156, 202);
static int TexturePage = 0;