teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-26 14:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Piddly fart bullshit changes that don't really do anything

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7606 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-04-18 17:25:38 +00:00 committed by Christoph Oelckers
parent 0f613a227d
commit e25a197f3e
4 changed files with 31 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/build/src/engine.cpp
View file

@ -84,7 +84,7 @@ int32_t g_loadedMapVersion = -1; // -1: none (e.g. started new)
static int32_t get_mapversion(void); static int32_t get_mapversion(void);
// Handle nonpow2-ysize walls the old way? // Handle nonpow2-ysize walls the old way?
static inline int32_t oldnonpow2(void) static FORCE_INLINE int32_t oldnonpow2(void)
{ {
#if !defined CLASSIC_NONPOW2_YSIZE_WALLS #if !defined CLASSIC_NONPOW2_YSIZE_WALLS
return 1; return 1;
@ -1549,14 +1549,10 @@ int32_t renderAddTsprite(int16_t z, int16_t sectnum)
return 0; return 0;
} }
static inline vec2_t get_rel_coords(int32_t const x, int32_t const y) static FORCE_INLINE vec2_t get_rel_coords(int32_t const x, int32_t const y)
{ {
vec2_t const p = { return { dmulscale6(y, cosglobalang, -x, singlobalang),
dmulscale6(y,cosglobalang, -x,singlobalang), dmulscale6(x, cosviewingrangeglobalang, y, sinviewingrangeglobalang) };
dmulscale6(x,cosviewingrangeglobalang, y,sinviewingrangeglobalang)
};
return p;
} }
// Note: the returned y coordinates are not actually screen coordinates, but // Note: the returned y coordinates are not actually screen coordinates, but
@ -1632,12 +1628,13 @@ static int get_screen_coords(const vec2_t &p1, const vec2_t &p2,
return 1; return 1;
} }
int lastUnusedTile = MAXUSERTILES-1;
static inline int findUnusedTile(void) static inline int findUnusedTile(void)
{ {
static int lastUnusedTile = MAXUSERTILES-1;
for (; lastUnusedTile >= 0; --lastUnusedTile) for (; lastUnusedTile >= 0; --lastUnusedTile)
if (tilesiz[lastUnusedTile].x * tilesiz[lastUnusedTile].y == 0) if ((tilesiz[lastUnusedTile].x|tilesiz[lastUnusedTile].y) == 0)
return lastUnusedTile; return lastUnusedTile;
return -1; return -1;

11
source/duke3d/src/gameexec.cpp
View file

@ -6973,7 +6973,7 @@ int32_t VM_CheckSquished2(int32_t i, int32_t snum)
#endif #endif
// MYOS* CON commands. // MYOS* CON commands.
LUNATIC_EXTERN void VM_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p) void VM_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p)
{ {
orientation &= (ROTATESPRITE_MAX-1); orientation &= (ROTATESPRITE_MAX-1);
@ -6997,11 +6997,6 @@ void VM_DrawTile(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t o
VM_DrawTileGeneric(x, y, 65536, tilenum, shade, orientation, tilePal); VM_DrawTileGeneric(x, y, 65536, tilenum, shade, orientation, tilePal);
} }
void VM_DrawTilePal(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p)
{
VM_DrawTileGeneric(x, y, 65536, tilenum, shade, orientation, p);
}
void VM_DrawTileSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation) void VM_DrawTileSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation)
{ {
DukePlayer_t *const pPlayer = g_player[screenpeek].ps; DukePlayer_t *const pPlayer = g_player[screenpeek].ps;
@ -7010,8 +7005,4 @@ void VM_DrawTileSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int3
VM_DrawTileGeneric(x, y, 32768, tilenum, shade, orientation, tilePal); VM_DrawTileGeneric(x, y, 32768, tilenum, shade, orientation, tilePal);
} }
void VM_DrawTilePalSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p)
{
VM_DrawTileGeneric(x, y, 32768, tilenum, shade, orientation, p);
}
#endif #endif

18
source/duke3d/src/gameexec.h
View file

@ -65,14 +65,20 @@ int __fastcall G_GetAngleDelta(int currAngle, int newAngle);
void G_RestoreMapState(); void G_RestoreMapState();
void G_SaveMapState(); void G_SaveMapState();
#if !defined LUNATIC
void VM_DrawTile(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation);
void VM_DrawTilePal(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p);
void VM_DrawTilePalSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p);
void VM_DrawTileSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation);
#else
void VM_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum, void VM_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum,
int32_t shade, int32_t orientation, int32_t p); int32_t shade, int32_t orientation, int32_t p);
#if !defined LUNATIC
void VM_DrawTile(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation);
static inline void VM_DrawTilePal(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p)
{
VM_DrawTileGeneric(x, y, 65536, tilenum, shade, orientation, p);
}
static inline void VM_DrawTilePalSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p)
{
VM_DrawTileGeneric(x, y, 32768, tilenum, shade, orientation, p);
}
void VM_DrawTileSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation);
#endif #endif
int32_t VM_OnEvent__(int nEventID, int spriteNum, int playerNum); int32_t VM_OnEvent__(int nEventID, int spriteNum, int playerNum);

27
source/duke3d/src/sector.h
View file

@ -151,29 +151,25 @@ int SetAnimation(int sectNum,int32_t *animPtr,int goalVal,int animVel);
#define FORCEFIELD_CSTAT (64+16+4+1) #define FORCEFIELD_CSTAT (64+16+4+1)
// Returns W_FORCEFIELD if wall has a forcefield overpicnum, its overpicnum else. // Returns W_FORCEFIELD if wall has a forcefield overpicnum, its overpicnum else.
static inline int G_GetForcefieldPicnum(int wallNum) static FORCE_INLINE int G_GetForcefieldPicnum(int const wallNum)
{ {
int tileNum = wall[wallNum].overpicnum; int const tileNum = wall[wallNum].overpicnum;
if (tileNum == W_FORCEFIELD + 1) return tileNum == W_FORCEFIELD + 1 ? W_FORCEFIELD : tileNum;
tileNum = W_FORCEFIELD;
return tileNum;
} }
// Returns the interpolated position of the camera that the player is looking // Returns the interpolated position of the camera that the player is looking
// through (using a viewscreen). <i> should be the player's ->newowner member. // through (using a viewscreen). <i> should be the player's ->newowner member.
static inline vec3_t G_GetCameraPosition(int32_t i, int32_t smoothratio) static inline vec3_t G_GetCameraPosition(int32_t const i, int32_t const smoothratio)
{ {
const spritetype *const cs = &sprite[i]; auto const cs = (uspriteptr_t)&sprite[i];
const actor_t *const ca = &actor[i]; const actor_t *const ca = &actor[i];
vec3_t cam = { ca->bpos.x + mulscale16(cs->x - ca->bpos.x, smoothratio), return { ca->bpos.x + mulscale16(cs->x - ca->bpos.x, smoothratio),
ca->bpos.y + mulscale16(cs->y - ca->bpos.y, smoothratio), ca->bpos.y + mulscale16(cs->y - ca->bpos.y, smoothratio),
ca->bpos.z + mulscale16(cs->z - ca->bpos.z, smoothratio) ca->bpos.z + mulscale16(cs->z - ca->bpos.z, smoothratio) };
};
return cam;
} }
EXTERN_INLINE_HEADER int32_t G_CheckPlayerInSector(int32_t sect); EXTERN_INLINE_HEADER int32_t G_CheckPlayerInSector(int32_t const sect);
#ifdef __cplusplus #ifdef __cplusplus
} }
@ -181,10 +177,9 @@ EXTERN_INLINE_HEADER int32_t G_CheckPlayerInSector(int32_t sect);
#if defined sector_c_ || !defined DISABLE_INLINING #if defined sector_c_ || !defined DISABLE_INLINING
EXTERN_INLINE int32_t G_CheckPlayerInSector(int32_t sect) EXTERN_INLINE int32_t G_CheckPlayerInSector(int32_t const sect)
{ {
int32_t i; for (int TRAVERSE_CONNECT(i))
for (TRAVERSE_CONNECT(i))
if ((unsigned)g_player[i].ps->i < MAXSPRITES && sprite[g_player[i].ps->i].sectnum == sect) if ((unsigned)g_player[i].ps->i < MAXSPRITES && sprite[g_player[i].ps->i].sectnum == sect)
return i; return i;
return -1; return -1;