Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it
This commit is contained in:
parent
9cda82d896
commit
4f26a8e73a
|
@ -1527,8 +1527,6 @@ static void TextmapParse(UINT32 dataPos, size_t num, void (*parser)(UINT32, char
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MAXFLATSIZE (2048<<FRACBITS)
|
|
||||||
|
|
||||||
/** Provides a fix to the flat alignment coordinate transform from standard Textmaps.
|
/** Provides a fix to the flat alignment coordinate transform from standard Textmaps.
|
||||||
*/
|
*/
|
||||||
static void TextmapFixFlatOffsets(sector_t *sec)
|
static void TextmapFixFlatOffsets(sector_t *sec)
|
||||||
|
@ -1554,8 +1552,6 @@ static void TextmapFixFlatOffsets(sector_t *sec)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef MAXFLATSIZE
|
|
||||||
|
|
||||||
/** Loads the textmap data, after obtaining the elements count and allocating their respective space.
|
/** Loads the textmap data, after obtaining the elements count and allocating their respective space.
|
||||||
*/
|
*/
|
||||||
static void P_LoadTextmap(void)
|
static void P_LoadTextmap(void)
|
||||||
|
|
|
@ -52,9 +52,6 @@ mobj_t *skyboxcenterpnts[16]; // array of MT_SKYBOX centerpoint mobjs
|
||||||
// Amount (dx, dy) vector linedef is shifted right to get scroll amount
|
// Amount (dx, dy) vector linedef is shifted right to get scroll amount
|
||||||
#define SCROLL_SHIFT 5
|
#define SCROLL_SHIFT 5
|
||||||
|
|
||||||
// This must be updated whenever we up the max flat size - quicker to assume rather than figuring out the sqrt of the specific flat's filesize.
|
|
||||||
#define MAXFLATSIZE (2048<<FRACBITS)
|
|
||||||
|
|
||||||
/** Animated texture descriptor
|
/** Animated texture descriptor
|
||||||
* This keeps track of an animated texture or an animated flat.
|
* This keeps track of an animated texture or an animated flat.
|
||||||
* \sa P_UpdateSpecials, P_InitPicAnims, animdef_t
|
* \sa P_UpdateSpecials, P_InitPicAnims, animdef_t
|
||||||
|
|
|
@ -27,6 +27,9 @@ extern mobj_t *skyboxcenterpnts[16]; // array of MT_SKYBOX centerpoint mobjs
|
||||||
//
|
//
|
||||||
#define GETSECSPECIAL(i,j) ((i >> ((j-1)*4))&15)
|
#define GETSECSPECIAL(i,j) ((i >> ((j-1)*4))&15)
|
||||||
|
|
||||||
|
// This must be updated whenever we up the max flat size - quicker to assume rather than figuring out the sqrt of the specific flat's filesize.
|
||||||
|
#define MAXFLATSIZE (2048<<FRACBITS)
|
||||||
|
|
||||||
// at game start
|
// at game start
|
||||||
void P_InitPicAnims(void);
|
void P_InitPicAnims(void);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue