shithub: choc

Info  •  Files  •  Log  •  Branches

Merge pull request #1520 from turol/extern-heretic

Clean up extern in heretic, part 2

--- a/src/heretic/p_inter.c

+++ b/src/heretic/p_inter.c

@@ -125,8 +125,6 @@

 void P_SetMessage(player_t * player, const char *message, boolean ultmsg)

 {

-    extern boolean messageson;

-

     if ((ultimatemsg || !messageson) && !ultmsg)

     {

         return;

--- a/src/heretic/p_local.h

+++ b/src/heretic/p_local.h

@@ -119,7 +119,9 @@

 void P_PlayerUseArtifact(player_t * player, artitype_t arti);

 boolean P_UseArtifact(player_t * player, artitype_t arti);

 int P_GetPlayerNum(player_t * player);

+boolean P_UndoPlayerChicken(player_t *player);

+

 // ***** P_MOBJ *****

 #define FLOOR_SOLID 0

@@ -225,6 +227,9 @@

 boolean P_TryMove(mobj_t * thing, fixed_t x, fixed_t y);

 boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y);

 void P_SlideMove(mobj_t * mo);

+

+extern fixed_t topslope, bottomslope;   // slopes to top and bottom of target

+

 boolean P_CheckSight(mobj_t * t1, mobj_t * t2);

 void P_UseLines(player_t * player);

@@ -251,6 +256,9 @@

 extern int maxammo[NUMAMMO];

 extern int clipammo[NUMAMMO];

+

+extern boolean messageson;

+

 void P_SetMessage(player_t * player, const char *message, boolean ultmsg);

 void P_TouchSpecialThing(mobj_t * special, mobj_t * toucher);

--- a/src/heretic/p_map.c

+++ b/src/heretic/p_map.c

@@ -1167,7 +1167,6 @@

 fixed_t aimslope;

-extern fixed_t topslope, bottomslope;   // slopes to top and bottom of target

 /*

 ===============================================================================

--- a/src/heretic/sb_bar.c

+++ b/src/heretic/sb_bar.c

@@ -1242,8 +1242,6 @@

 static void CheatChickenFunc(player_t * player, Cheat_t * cheat)

 {

-    extern boolean P_UndoPlayerChicken(player_t * player);

-

     if (player->chickenTics)

     {

         if (P_UndoPlayerChicken(player))