From 0fefd86d1e0874dbe16b03da3515b82a9236a294 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Fri, 8 Jul 2016 22:56:17 +0100
Subject: [PATCH] More generic name for P_ElementalFireTrail upon MI's request

---
 src/lua_baselib.c | 6 +++---
 src/p_local.h     | 2 +-
 src/p_mobj.c      | 2 +-
 src/p_user.c      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index d34e319cb..745c9dcd3 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -777,14 +777,14 @@ static int lib_pBlackOw(lua_State *L)
 	return 0;
 }
 
-static int lib_pElementalFireTrail(lua_State *L)
+static int lib_pElementalFire(lua_State *L)
 {
 	player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
 	boolean cropcircle = lua_optboolean(L, 2);
 	NOHUD
 	if (!player)
 		return LUA_ErrInvalid(L, "player_t");
-	P_ElementalFireTrail(player, cropcircle);
+	P_ElementalFire(player, cropcircle);
 	return 0;
 }
 
@@ -2038,7 +2038,7 @@ static luaL_Reg lib[] = {
 	{"P_ResetScore",lib_pResetScore},
 	{"P_DoJumpShield",lib_pDoJumpShield},
 	{"P_BlackOw",lib_pBlackOw},
-	{"P_ElementalFireTrail",lib_pElementalFireTrail},
+	{"P_ElementalFire",lib_pElementalFire},
 	{"P_DoPlayerExit",lib_pDoPlayerExit},
 	{"P_InstaThrust",lib_pInstaThrust},
 	{"P_ReturnThrustX",lib_pReturnThrustX},
diff --git a/src/p_local.h b/src/p_local.h
index 26369d899..05d1a4823 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -151,7 +151,7 @@ boolean P_AutoPause(void);
 
 void P_DoJumpShield(player_t *player);
 void P_BlackOw(player_t *player);
-void P_ElementalFireTrail(player_t *player, boolean cropcircle);
+void P_ElementalFire(player_t *player, boolean cropcircle);
 
 void P_DoPityCheck(player_t *player);
 void P_PlayerThink(player_t *player);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index ab8071904..13dd15d21 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2988,7 +2988,7 @@ static void P_PlayerZMovement(mobj_t *mo)
 						else // create a fire pattern on the ground
 						{
 							S_StartSound(mo, sfx_s3k47);
-							P_ElementalFireTrail(mo->player, true);
+							P_ElementalFire(mo->player, true);
 						}
 					}
 					mo->player->pflags &= ~(PF_THOKKED|PF_SHIELDABILITY);
diff --git a/src/p_user.c b/src/p_user.c
index 5579178d1..75c70135a 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6200,7 +6200,7 @@ void P_BlackOw(player_t *player)
 	player->powers[pw_shield] = player->powers[pw_shield] & SH_STACK;
 }
 
-void P_ElementalFireTrail(player_t *player, boolean cropcircle)
+void P_ElementalFire(player_t *player, boolean cropcircle)
 {
 	fixed_t newx;
 	fixed_t newy;
@@ -6812,7 +6812,7 @@ static void P_MovePlayer(player_t *player)
 	if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL
 	&& (player->pflags & PF_SPINNING) && player->speed > FixedMul(4<<FRACBITS, player->mo->scale) && onground && (leveltime & 1)
 	&& !(player->mo->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
-		P_ElementalFireTrail(player, false);
+		P_ElementalFire(player, false);
 
 	P_DoSpinDash(player, cmd);