Skip to content

Commit f3cdd70

Browse files
committed
Fix argument checking for extinguishFire
1 parent eeff04b commit f3cdd70

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,29 @@ int CLuaFireDefs::ExtinguishFire(lua_State* luaVM)
4646
// bool extinguishFire ( [ float x, float y, float z [, float radius = 1.0 ] ] )
4747
CScriptArgReader argStream(luaVM);
4848

49-
if (argStream.NextIsVector3D())
49+
if (argStream.NextIsNone())
5050
{
51-
CVector vecPosition;
52-
float fRadius;
51+
lua_pushboolean(luaVM, CStaticFunctionDefinitions::ExtinguishAllFires());
52+
return 1;
53+
}
5354

54-
argStream.ReadVector3D(vecPosition);
55-
argStream.ReadNumber(fRadius, 1.0f);
55+
CVector vecPosition;
56+
float fRadius;
5657

57-
if (!argStream.HasErrors())
58+
argStream.ReadVector3D(vecPosition);
59+
argStream.ReadNumber(fRadius, 1.0f);
60+
61+
if (!argStream.HasErrors())
62+
{
63+
if (CStaticFunctionDefinitions::ExtinguishFireInRadius(vecPosition, fRadius))
5864
{
59-
if (CStaticFunctionDefinitions::ExtinguishFireInRadius(vecPosition, fRadius))
60-
{
61-
lua_pushboolean(luaVM, true);
62-
return 1;
63-
}
65+
lua_pushboolean(luaVM, true);
66+
return 1;
6467
}
65-
else
66-
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
67-
68-
lua_pushboolean(luaVM, false);
69-
return 1;
7068
}
69+
else
70+
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
7171

72-
lua_pushboolean(luaVM, CStaticFunctionDefinitions::ExtinguishAllFires());
72+
lua_pushboolean(luaVM, false);
7373
return 1;
7474
}

0 commit comments

Comments
 (0)