diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index 6688f3d0e..ad51a5c8a 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -37,14 +37,6 @@ extern int32_t g_levelTextTime, ticrandomseed; int32_t g_numObituaries = 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) { int32_t intowater = 0; diff --git a/polymer/eduke32/source/player.h b/polymer/eduke32/source/player.h index 4dc9db11e..761f337f1 100644 --- a/polymer/eduke32/source/player.h +++ b/polymer/eduke32/source/player.h @@ -341,6 +341,14 @@ static inline int32_t A_Shoot(int32_t i, int32_t atwith) 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); void getinput(int32_t snum); 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_SelectNextInvItem(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); #endif