summaryrefslogtreecommitdiff
path: root/src/heretic/p_user.c
diff options
context:
space:
mode:
authorSimon Howard2011-10-29 22:58:13 +0000
committerSimon Howard2011-10-29 22:58:13 +0000
commit4bf764a5b8952856b1ca04f1282121e8054938de (patch)
tree1a5992de07f5b5377854dd3a0aab42ff7c81db10 /src/heretic/p_user.c
parentcfbdd3d79d1e3cc48165536cb7b4166b94f77e9b (diff)
downloadchocolate-doom-4bf764a5b8952856b1ca04f1282121e8054938de.tar.gz
chocolate-doom-4bf764a5b8952856b1ca04f1282121e8054938de.tar.bz2
chocolate-doom-4bf764a5b8952856b1ca04f1282121e8054938de.zip
Enable gcc warning to detect redundant declarations, and clean up
instances of this within the code (thanks Edward-san). Subversion-branch: /branches/v2-branch Subversion-revision: 2468
Diffstat (limited to 'src/heretic/p_user.c')
-rw-r--r--src/heretic/p_user.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/heretic/p_user.c b/src/heretic/p_user.c
index 6b2a69fc..79620630 100644
--- a/src/heretic/p_user.c
+++ b/src/heretic/p_user.c
@@ -313,12 +313,12 @@ void P_MovePlayer(player_t * player)
*/
#define ANG5 (ANG90/18)
+extern int inv_ptr;
+extern int curpos;
void P_DeathThink(player_t * player)
{
angle_t angle, delta;
- extern int inv_ptr;
- extern int curpos;
int lookDelta;
P_MovePsprites(player);
@@ -543,8 +543,6 @@ void P_PlayerThink(player_t * player)
ticcmd_t *cmd;
weapontype_t newweapon;
- extern boolean ultimatemsg;
-
// No-clip cheat
if (player->cheats & CF_NOCLIP)
{
@@ -812,9 +810,6 @@ void P_ArtiTele(player_t * player)
void P_PlayerNextArtifact(player_t * player)
{
- extern int inv_ptr;
- extern int curpos;
-
if (player == &players[consoleplayer])
{
inv_ptr--;
@@ -851,9 +846,6 @@ void P_PlayerNextArtifact(player_t * player)
void P_PlayerRemoveArtifact(player_t * player, int slot)
{
int i;
- extern int inv_ptr;
- extern int curpos;
-
player->artifactCount--;
if (!(--player->inventory[slot].count))
{ // Used last of a type - compact the artifact list