Skip to content

#251: merge the two fire extinguish functions into one extinguishFire #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 23, 2018
Merged

#251: merge the two fire extinguish functions into one extinguishFire #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
void CLuaFireDefs::LoadFunctions(void)
{
CLuaCFunctions::AddFunction("createFire", CLuaFireDefs::CreateFire);
CLuaCFunctions::AddFunction("extinguishFireInRadius", CLuaFireDefs::ExtinguishFireInRadius);
CLuaCFunctions::AddFunction("extinguishAllFires", CLuaFireDefs::ExtinguishAllFires);
CLuaCFunctions::AddFunction("extinguishFire", CLuaFireDefs::ExtinguishFire);
}

int CLuaFireDefs::CreateFire(lua_State* luaVM)
Expand Down Expand Up @@ -42,34 +41,34 @@ int CLuaFireDefs::CreateFire(lua_State* luaVM)
return 1;
}

int CLuaFireDefs::ExtinguishFireInRadius(lua_State* luaVM)
int CLuaFireDefs::ExtinguishFire(lua_State* luaVM)
{
// bool extinguishFireInRadius ( float x, float y, float z [, float radius = 1.0 ] )
CVector vecPosition;
float fRadius;

// bool extinguishFire ( [ float x, float y, float z [, float radius = 1.0 ] ] )
CScriptArgReader argStream(luaVM);
argStream.ReadVector3D(vecPosition);
argStream.ReadNumber(fRadius, 1.0f);

if (!argStream.HasErrors())
if (argStream.NextIsVector3D())
{
if (CStaticFunctionDefinitions::ExtinguishFireInRadius(vecPosition, fRadius))
CVector vecPosition;
float fRadius;

argStream.ReadVector3D(vecPosition);
argStream.ReadNumber(fRadius, 1.0f);

if (!argStream.HasErrors())
{
lua_pushboolean(luaVM, true);
return 1;
if (CStaticFunctionDefinitions::ExtinguishFireInRadius(vecPosition, fRadius))
{
lua_pushboolean(luaVM, true);
return 1;
}
}
}
else
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
else
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

lua_pushboolean(luaVM, false);
return 1;
}
lua_pushboolean(luaVM, false);
return 1;
}

int CLuaFireDefs::ExtinguishAllFires(lua_State* luaVM)
{
// bool extinguishAllFires ( )
lua_pushboolean(luaVM, CStaticFunctionDefinitions::ExtinguishAllFires());
return 1;
}
3 changes: 1 addition & 2 deletions Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ class CLuaFireDefs : public CLuaDefs
static void LoadFunctions(void);

LUA_DECLARE(CreateFire);
LUA_DECLARE(ExtinguishFireInRadius);
LUA_DECLARE(ExtinguishAllFires);
LUA_DECLARE(ExtinguishFire);
};