zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make P_PalFrom() static inline in player.h as the whole function is just 4 assignments

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3901 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2013-06-27 23:04:24 +00:00
parent b1dd4ffc6c
commit 6516a29778
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/source/player.c
View file

@ -37,14 +37,6 @@ extern int32_t g_levelTextTime, ticrandomseed;
int32_t g_numObituaries = 0; int32_t g_numObituaries = 0;
int32_t g_numSelfObituaries = 0; int32_t g_numSelfObituaries = 0;
void P_PalFrom(DukePlayer_t *p, uint8_t f, uint8_t r, uint8_t g, uint8_t b)
{
p->pals.f = f;
p->pals.r = r;
p->pals.g = g;
p->pals.b = b;
}
void P_UpdateScreenPal(DukePlayer_t *p) void P_UpdateScreenPal(DukePlayer_t *p)
{ {
int32_t intowater = 0; int32_t intowater = 0;

9
polymer/eduke32/source/player.h
View file

@ -341,6 +341,14 @@ static inline int32_t A_Shoot(int32_t i, int32_t atwith)
return A_ShootWithZvel(i, atwith, SHOOT_HARDCODED_ZVEL); return A_ShootWithZvel(i, atwith, SHOOT_HARDCODED_ZVEL);
} }
static inline void P_PalFrom(DukePlayer_t *p, uint8_t f, uint8_t r, uint8_t g, uint8_t b)
{
p->pals.f = f;
p->pals.r = r;
p->pals.g = g;
p->pals.b = b;
}
int32_t A_GetHitscanRange(int32_t i); int32_t A_GetHitscanRange(int32_t i);
void getinput(int32_t snum); void getinput(int32_t snum);
void P_AddAmmo(int32_t weapon,DukePlayer_t *p,int32_t amount); void P_AddAmmo(int32_t weapon,DukePlayer_t *p,int32_t amount);
@ -357,7 +365,6 @@ void P_ProcessInput(int32_t snum);
void P_QuickKill(DukePlayer_t *p); void P_QuickKill(DukePlayer_t *p);
void P_SelectNextInvItem(DukePlayer_t *p); void P_SelectNextInvItem(DukePlayer_t *p);
void P_UpdateScreenPal(DukePlayer_t *p); void P_UpdateScreenPal(DukePlayer_t *p);
void P_PalFrom(DukePlayer_t *p, uint8_t f, uint8_t r, uint8_t g, uint8_t b);
void P_SetWeaponGamevars(int32_t snum, const DukePlayer_t *p); void P_SetWeaponGamevars(int32_t snum, const DukePlayer_t *p);
#endif #endif