Skip to content

Commit 98f7f4a

Browse files
committed
Fixed recent change in behaviour of setCameraMatrix
1 parent ed77b94 commit 98f7f4a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ int CLuaCameraDefs::SetCameraMatrix(lua_State* luaVM)
201201
float fRoll = 0.0f;
202202
float fFOV = 70.0f;
203203
CScriptArgReader argStream(luaVM);
204+
bool bLookAtValid;
204205

205206
if (argStream.NextIsUserDataOfType<CLuaMatrix>())
206207
{
@@ -209,10 +210,12 @@ int CLuaCameraDefs::SetCameraMatrix(lua_State* luaVM)
209210

210211
vecPosition = pMatrix->GetPosition();
211212
vecLookAt = pMatrix->GetRotation();
213+
bLookAtValid = true;
212214
}
213215
else
214216
{
215217
argStream.ReadVector3D(vecPosition);
218+
bLookAtValid = argStream.NextIsVector3D();
216219
argStream.ReadVector3D(vecLookAt, CVector());
217220
}
218221

@@ -223,7 +226,7 @@ int CLuaCameraDefs::SetCameraMatrix(lua_State* luaVM)
223226

224227
if (!argStream.HasErrors())
225228
{
226-
if (CStaticFunctionDefinitions::SetCameraMatrix(vecPosition, &vecLookAt, fRoll, fFOV))
229+
if (CStaticFunctionDefinitions::SetCameraMatrix(vecPosition, bLookAtValid ? &vecLookAt : nullptr, fRoll, fFOV))
227230
{
228231
lua_pushboolean(luaVM, true);
229232
return 1;

0 commit comments

Comments
 (0)