From 671bd67aa86ac11a477f57d8d080a6d5cae33a37 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 20 Jan 2013 21:17:19 +0000 Subject: [PATCH] player.c: make four functions file-local. git-svn-id: https://svn.eduke32.com/eduke32@3418 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/player.c | 9 ++++----- polymer/eduke32/source/player.h | 4 ---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index 6b94b938d..9b9a9529f 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -2005,7 +2005,7 @@ static void P_FireWeapon(DukePlayer_t *p) } } -void P_DoWeaponSpawn(DukePlayer_t *p) +static void P_DoWeaponSpawn(const DukePlayer_t *p) { int32_t j, snum = sprite[p->i].yvel; @@ -3341,7 +3341,7 @@ void P_CheckWeapon(DukePlayer_t *p) P_ChangeWeapon(p, weapon); } -void P_CheckTouchDamage(DukePlayer_t *p, int32_t obj) +static void P_CheckTouchDamage(DukePlayer_t *p, int32_t obj) { if ((obj = VM_OnEvent(EVENT_CHECKTOUCHDAMAGE, p->i, sprite[p->i].yvel, -1, obj)) == -1) return; @@ -3415,7 +3415,7 @@ void P_CheckTouchDamage(DukePlayer_t *p, int32_t obj) } } -int32_t P_CheckFloorDamage(DukePlayer_t *p, int32_t tex) +static int32_t P_CheckFloorDamage(DukePlayer_t *p, int32_t tex) { spritetype *s = &sprite[p->i]; @@ -4043,7 +4043,6 @@ static void P_ProcessWeapon(int32_t snum) } else if (((*kb) == (PWEAPON(snum, p->curr_weapon, Reload) - (i/3)) && !(PWEAPON(snum, p->curr_weapon, Flags) & WEAPON_RELOAD_TIMING)) || - ((*kb) == (PWEAPON(snum, p->curr_weapon, Reload) - i+4) && (PWEAPON(snum, p->curr_weapon, Flags) & WEAPON_RELOAD_TIMING))) { @@ -4142,7 +4141,7 @@ static void P_ProcessWeapon(int32_t snum) } } -int32_t P_DoFist(DukePlayer_t *p) +static int32_t P_DoFist(DukePlayer_t *p) { // the fist punching NUKEBUTTON diff --git a/polymer/eduke32/source/player.h b/polymer/eduke32/source/player.h index 70b27a2c1..79ecd3a5f 100644 --- a/polymer/eduke32/source/player.h +++ b/polymer/eduke32/source/player.h @@ -339,13 +339,9 @@ void getinput(int32_t snum); void P_AddAmmo(int32_t weapon,DukePlayer_t *p,int32_t amount); void P_AddWeapon(DukePlayer_t *p,int32_t weapon); void P_AddWeaponNoSwitch(DukePlayer_t *p,int32_t weapon); -int32_t P_CheckFloorDamage(DukePlayer_t *p,int32_t j); -void P_CheckTouchDamage(DukePlayer_t *p,int32_t j); void P_CheckWeapon(DukePlayer_t *p); void P_DisplayScuba(int32_t snum); void P_DisplayWeapon(int32_t snum); -int32_t P_DoFist(DukePlayer_t *p); -void P_DoWeaponSpawn(DukePlayer_t *p); void P_DropWeapon(DukePlayer_t *p); int32_t P_FindOtherPlayer(int32_t p,int32_t *d); void P_FragPlayer(int32_t snum);