From 4ebcb623b40b02515d4cc853806a4e7c33ba1d5e Mon Sep 17 00:00:00 2001 From: Michael McKoy Date: Sun, 27 Jan 2008 16:32:47 +0000 Subject: [PATCH] Fixed fire.sp cvars that were using timebomb stuff. --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401870 --- plugins/basefuncommands.sp | 11 ++--------- plugins/basefuncommands/fire.sp | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/plugins/basefuncommands.sp b/plugins/basefuncommands.sp index 376a1c8d..303e6bb4 100644 --- a/plugins/basefuncommands.sp +++ b/plugins/basefuncommands.sp @@ -51,9 +51,9 @@ public Plugin:myinfo = // Set any of these to 0 and recompile to completely disable those commands // ------------------------------------------------------------------------------- #define BEACON 1 -#define TIMEBOMB 0 +#define TIMEBOMB 1 #define FIRE 1 -#define ICE 1 +#define ICE 1 #define GRAVITY 1 #define BLIND 1 #define NOCLIP 1 @@ -64,13 +64,6 @@ public Plugin:myinfo = #define CASH 1 // ------------------------------------------------------------------------------- -/** - * Fire requires timebomb - */ -#if TIMEBOMB == 0 && FIRE == 1 -#error "FIRE requires TIMEBOMB" -#endif - new Handle:hTopMenu = INVALID_HANDLE; // Sounds diff --git a/plugins/basefuncommands/fire.sp b/plugins/basefuncommands/fire.sp index 90e96c3c..9f0b4c31 100644 --- a/plugins/basefuncommands/fire.sp +++ b/plugins/basefuncommands/fire.sp @@ -190,7 +190,7 @@ public Action:Timer_FireBomb(Handle:timer, any:client) if (GetConVarInt(g_FireBombMode) > 0) { - new teamOnly = ((GetConVarInt(g_TimeBombMode) == 1) ? true : false); + new teamOnly = ((GetConVarInt(g_FireBombMode) == 1) ? true : false); new maxClients = GetMaxClients(); for (new i = 1; i < maxClients; i++) @@ -216,7 +216,7 @@ public Action:Timer_FireBomb(Handle:timer, any:client) } new Float:duration = GetConVarFloat(g_BurnDuration); - duration *= (GetConVarFloat(g_TimeBombRadius) - distance) / GetConVarFloat(g_TimeBombRadius); + duration *= (GetConVarFloat(g_FireBombRadius) - distance) / GetConVarFloat(g_FireBombRadius); IgniteEntity(i, duration); }