zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dicking around with inlined actor header functions

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6252 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-06-24 06:31:32 +00:00
parent 6d3978b471
commit 4e3f55df9b
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/duke3d/src/actors.h
View file

@ -161,6 +161,8 @@ typedef struct
struct action ac; struct action ac;
// Gets incremented by TICSPERFRAME on each A_Execute() call: // Gets incremented by TICSPERFRAME on each A_Execute() call:
uint16_t actiontics; uint16_t actiontics;
// Movement flags, sprite[i].hitag in C-CON:
uint16_t movflags;
#endif #endif
int32_t flags; // 4b int32_t flags; // 4b
@ -171,10 +173,6 @@ typedef struct
int16_t movflag, tempang, timetosleep; // 6b int16_t movflag, tempang, timetosleep; // 6b
int16_t actorstayput; // 2b int16_t actorstayput; // 2b
#ifdef LUNATIC
// Movement flags, sprite[i].hitag in C-CON:
uint16_t movflags;
#endif
uint8_t cgg, lasttransport; // 2b uint8_t cgg, lasttransport; // 2b
// NOTE: 'dispicnum' is updated every frame, not in sync with game tics! // NOTE: 'dispicnum' is updated every frame, not in sync with game tics!
int16_t dispicnum; // 2b int16_t dispicnum; // 2b
@ -195,6 +193,7 @@ typedef struct
struct move mv; struct move mv;
struct action ac; struct action ac;
uint16_t actiontics; uint16_t actiontics;
uint16_t movflags;
#endif #endif
int32_t flags; // 4b int32_t flags; // 4b
@ -205,9 +204,6 @@ typedef struct
int16_t movflag, tempang, timetosleep; // 6b int16_t movflag, tempang, timetosleep; // 6b
int16_t actorstayput; int16_t actorstayput;
#ifdef LUNATIC
uint16_t movflags;
#endif
uint8_t cgg, lasttransport; uint8_t cgg, lasttransport;
spritetype sprite; spritetype sprite;
@ -340,12 +336,12 @@ int32_t G_ToggleWallInterpolation(int32_t w, int32_t doset);
#endif #endif
extern int32_t A_MoveSpriteClipdist(int32_t spritenum, vec3_t const * const change, uint32_t cliptype, int32_t clipdist); extern int32_t A_MoveSpriteClipdist(int32_t spritenum, vec3_t const * const change, uint32_t cliptype, int32_t clipdist);
ACTOR_INLINE_HEADER int A_CheckEnemyTile(int32_t pn); ACTOR_INLINE_HEADER int A_CheckEnemyTile(int const tileNum);
ACTOR_INLINE_HEADER int32_t A_SetSprite(int32_t i,uint32_t cliptype); ACTOR_INLINE_HEADER int A_SetSprite(int const spriteNum, uint32_t cliptype);
ACTOR_INLINE_HEADER int32_t A_MoveSprite(int32_t spritenum, vec3_t const * const change, uint32_t cliptype); ACTOR_INLINE_HEADER int32_t A_MoveSprite(int const spriteNum, vec3_t const * const change, uint32_t cliptype);
EXTERN_INLINE_HEADER int32_t G_CheckForSpaceCeiling(int32_t sectnum); EXTERN_INLINE_HEADER int G_CheckForSpaceCeiling(int const sectnum);
EXTERN_INLINE_HEADER int32_t G_CheckForSpaceFloor(int32_t sectnum); EXTERN_INLINE_HEADER int G_CheckForSpaceFloor(int const sectnum);
EXTERN_INLINE_HEADER int A_CheckEnemySprite(void const * const s); EXTERN_INLINE_HEADER int A_CheckEnemySprite(void const * const s);
@ -357,36 +353,34 @@ EXTERN_INLINE_HEADER int A_CheckEnemySprite(void const * const s);
# if !KRANDDEBUG || (KRANDDEBUG && defined actors_c_) # if !KRANDDEBUG || (KRANDDEBUG && defined actors_c_)
ACTOR_INLINE int A_CheckEnemyTile(int32_t pn) ACTOR_INLINE int A_CheckEnemyTile(int const tileNum)
{ {
return ((g_tile[pn].flags & (SFLAG_HARDCODED_BADGUY | SFLAG_BADGUY)) != 0); return ((g_tile[tileNum].flags & (SFLAG_HARDCODED_BADGUY | SFLAG_BADGUY)) != 0);
} }
ACTOR_INLINE int32_t A_SetSprite(int32_t i,uint32_t cliptype) ACTOR_INLINE int A_SetSprite(int const spriteNum, uint32_t cliptype)
{ {
vec3_t davect = {(sprite[i].xvel*(sintable[(sprite[i].ang+512)&2047]))>>14, vec3_t davect = { (sprite[spriteNum].xvel * (sintable[(sprite[spriteNum].ang + 512) & 2047])) >> 14,
(sprite[i].xvel*(sintable[sprite[i].ang&2047]))>>14, (sprite[spriteNum].xvel * (sintable[sprite[spriteNum].ang & 2047])) >> 14, sprite[spriteNum].zvel };
sprite[i].zvel return (A_MoveSprite(spriteNum, &davect, cliptype) == 0);
};
return (A_MoveSprite(i,&davect,cliptype)==0);
} }
ACTOR_INLINE int32_t A_MoveSprite(int32_t spritenum, vec3_t const * const change, uint32_t cliptype) ACTOR_INLINE int32_t A_MoveSprite(int const spriteNum, vec3_t const * const change, uint32_t cliptype)
{ {
return A_MoveSpriteClipdist(spritenum, change, cliptype, -1); return A_MoveSpriteClipdist(spriteNum, change, cliptype, -1);
} }
# endif # endif
# include "namesdyn.h" # include "namesdyn.h"
EXTERN_INLINE int32_t G_CheckForSpaceCeiling(int32_t sectnum) EXTERN_INLINE int G_CheckForSpaceCeiling(int const sectnum)
{ {
return ((sector[sectnum].ceilingstat&1) && sector[sectnum].ceilingpal == 0 && return ((sector[sectnum].ceilingstat&1) && sector[sectnum].ceilingpal == 0 &&
(sector[sectnum].ceilingpicnum==MOONSKY1 || sector[sectnum].ceilingpicnum==BIGORBIT1)); (sector[sectnum].ceilingpicnum==MOONSKY1 || sector[sectnum].ceilingpicnum==BIGORBIT1));
} }
EXTERN_INLINE int32_t G_CheckForSpaceFloor(int32_t sectnum) EXTERN_INLINE int G_CheckForSpaceFloor(int const sectnum)
{ {
return ((sector[sectnum].floorstat&1) && sector[sectnum].ceilingpal == 0 && return ((sector[sectnum].floorstat&1) && sector[sectnum].ceilingpal == 0 &&
(sector[sectnum].floorpicnum==MOONSKY1 || sector[sectnum].floorpicnum==BIGORBIT1)); (sector[sectnum].floorpicnum==MOONSKY1 || sector[sectnum].floorpicnum==BIGORBIT1));