mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-30 13:21:04 +00:00
Engine: Remove the LUNATIC-specific definitions
of engine_main_arrays_are_static, engine_v8 and Mulscale. # Conflicts: # source/build/src/engine.cpp
This commit is contained in:
parent
3592118e25
commit
dba06d9601
2 changed files with 0 additions and 13 deletions
|
@ -1207,12 +1207,6 @@ extern int skiptile;
|
||||||
|
|
||||||
static vec2_t const zerovec = { 0, 0 };
|
static vec2_t const zerovec = { 0, 0 };
|
||||||
|
|
||||||
#ifdef LUNATIC
|
|
||||||
extern const int32_t engine_main_arrays_are_static;
|
|
||||||
extern const int32_t engine_v8;
|
|
||||||
int32_t Mulscale(int32_t a, int32_t b, int32_t sh);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static FORCE_INLINE CONSTEXPR int inside_p(int32_t const x, int32_t const y, int const sectnum) { return (sectnum >= 0 && inside(x, y, sectnum) == 1); }
|
static FORCE_INLINE CONSTEXPR int inside_p(int32_t const x, int32_t const y, int const sectnum) { return (sectnum >= 0 && inside(x, y, sectnum) == 1); }
|
||||||
|
|
||||||
#define SET_AND_RETURN(Lval, Rval) \
|
#define SET_AND_RETURN(Lval, Rval) \
|
||||||
|
|
|
@ -4313,13 +4313,6 @@ int32_t ksqrt(uint32_t num)
|
||||||
return nsqrtasm(num);
|
return nsqrtasm(num);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef LUNATIC
|
|
||||||
int32_t Mulscale(int32_t a, int32_t b, int32_t sh)
|
|
||||||
{
|
|
||||||
return mulscale(a, b, sh);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Gets the BUILD unit height and z offset of a sprite.
|
// Gets the BUILD unit height and z offset of a sprite.
|
||||||
// Returns the z offset, 'height' may be NULL.
|
// Returns the z offset, 'height' may be NULL.
|
||||||
int32_t spriteheightofsptr(uspriteptr_t spr, int32_t *height, int32_t alsotileyofs)
|
int32_t spriteheightofsptr(uspriteptr_t spr, int32_t *height, int32_t alsotileyofs)
|
||||||
|
|
Loading…
Reference in a new issue