Add client-side function extinguishFireInRadius (#207)

Author: CrosRoad95

Client/game_sa/CFireManagerSA.h

@@ -16,7 +16,8 @@
 #include "Common.h"
 #include "CFireSA.h"
 
-#define FUNC_ExtinguishPoint            0x48E520
+#define FUNC_ExtinguishPoint            0x539450
+
 #define FUNC_StartFire                  0x48EC30
 #define FUNC_StartFire_Vec              0x539F00 // ##SA##
 

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -4106,6 +4106,12 @@ bool CStaticFunctionDefinitions::CreateFire(CVector& vecPosition, float fSize)
     return g_pGame->GetFireManager()->StartFire(vecPosition, fSize) != NULL;
 }
 
+bool CStaticFunctionDefinitions::ExtinguishFireInRadius(CVector& vecPosition, float fRadius)
+{
+    g_pGame->GetFireManager()->ExtinguishPoint(vecPosition, fRadius);
+    return true;
+}
+
 bool CStaticFunctionDefinitions::PlaySoundFrontEnd(unsigned char ucSound)
 {
     g_pGame->GetAudioEngine()->PlayFrontEndSound(ucSound);

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -307,6 +307,7 @@ class CStaticFunctionDefinitions
 
     // Fire funcs
     static bool CreateFire(CVector& vecPosition, float fSize);
+    static bool ExtinguishFireInRadius(CVector& vecPosition, float fRadius);
 
     // Light funcs
     static CClientPointLights* CreateLight(CResource& Resource, int iMode, const CVector& vecPosition, float fRadius, SColor color, CVector& vecDirection);

Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.World.cpp

@@ -71,6 +71,31 @@ int CLuaFunctionDefs::CreateFire(lua_State* luaVM)
     return 1;
 }
 
+int CLuaFunctionDefs::ExtinguishFireInRadius(lua_State* luaVM)
+{
+    //  bool extinguishFireInRadius ( float x, float y, float z [, float radius = 1.0 ] )
+    CVector vecPosition;
+    float   fRadius;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadVector3D(vecPosition);
+    argStream.ReadNumber(fRadius, 1.0f);
+
+    if (!argStream.HasErrors())
+    {
+        if (CStaticFunctionDefinitions::ExtinguishFireInRadius(vecPosition, fRadius))
+        {
+            lua_pushboolean(luaVM, true);
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 int CLuaFunctionDefs::GetTime_(lua_State* luaVM)
 {
     // Get the time

Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.h

@@ -69,6 +69,7 @@ class CLuaFunctionDefs
 
     // Fire functions
     LUA_DECLARE(CreateFire);
+    LUA_DECLARE(ExtinguishFireInRadius);
 
     // Cursor funcs
     LUA_DECLARE(GetCursorPosition);

Client/mods/deathmatch/logic/lua/CLuaManager.cpp

@@ -244,6 +244,7 @@ void CLuaManager::LoadCFunctions(void)
 
     // Fire funcs
     CLuaCFunctions::AddFunction("createFire", CLuaFunctionDefs::CreateFire);
+    CLuaCFunctions::AddFunction("extinguishFireInRadius", CLuaFunctionDefs::ExtinguishFireInRadius);
 
     // Cursor funcs
     CLuaCFunctions::AddFunction("getCursorPosition", CLuaFunctionDefs::GetCursorPosition);