Skip to content

Commit c473045

Browse files
committed
Addendum to previous commit
1 parent 91b239b commit c473045

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

Client/mods/deathmatch/logic/CClientVehicle.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4878,14 +4878,14 @@ bool CClientVehicle::DoesSupportUpgrade ( const SString& strFrameName )
48784878
return true;
48794879
}
48804880

4881-
void CClientVehicle::SetModelExhaustPosition(unsigned short modelID, const CVector& position)
4881+
void CClientVehicle::SetModelExhaustFumesPosition(unsigned short modelID, const CVector& position)
48824882
{
48834883
auto pModelInfo = g_pGame->GetModelInfo(modelID);
48844884
if (pModelInfo)
48854885
pModelInfo->SetVehicleExhaustFumesPosition(position);
48864886
}
48874887

4888-
CVector CClientVehicle::GetModelExhaustPosition(unsigned short modelID)
4888+
CVector CClientVehicle::GetModelExhaustFumesPosition(unsigned short modelID)
48894889
{
48904890
auto pModelInfo = g_pGame->GetModelInfo(modelID);
48914891
if (pModelInfo)

Client/mods/deathmatch/logic/CClientVehicle.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ class CClientVehicle : public CClientStreamElement
494494

495495
void SetHeliBladeCollisionsEnabled ( bool bEnable ) { m_bEnableHeliBladeCollisions = bEnable; }
496496

497-
static void SetModelExhaustPosition(unsigned short modelID, const CVector& position);
498-
static CVector GetModelExhaustPosition(unsigned short modelID);
497+
static void SetModelExhaustFumesPosition(unsigned short modelID, const CVector& position);
498+
static CVector GetModelExhaustFumesPosition(unsigned short modelID);
499499

500500
bool OnVehicleFallThroughMap ( );
501501

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ void CLuaVehicleDefs::LoadFunctions ( void )
127127
CLuaCFunctions::AddFunction ( "setVehiclePlateText", SetVehiclePlateText );
128128
CLuaCFunctions::AddFunction ( "setHeliBladeCollisionsEnabled", SetHeliBladeCollisionsEnabled );
129129
CLuaCFunctions::AddFunction ( "setVehicleWindowOpen", SetVehicleWindowOpen );
130-
CLuaCFunctions::AddFunction("setVehicleModelExhaustPosition", SetVehicleModelExhaustPosition);
131-
CLuaCFunctions::AddFunction("getVehicleModelExhaustPosition", GetVehicleModelExhaustPosition);
130+
CLuaCFunctions::AddFunction("setVehicleModelExhaustFumesPosition", SetVehicleModelExhaustFumesPosition);
131+
CLuaCFunctions::AddFunction("getVehicleModelExhaustFumesPosition", GetVehicleModelExhaustFumesPosition);
132132
}
133133

134134

@@ -3553,7 +3553,7 @@ int CLuaVehicleDefs::IsVehicleWindowOpen ( lua_State* luaVM )
35533553
return 1;
35543554
}
35553555

3556-
int CLuaVehicleDefs::SetVehicleModelExhaustPosition(lua_State* luaVM)
3556+
int CLuaVehicleDefs::SetVehicleModelExhaustFumesPosition(lua_State* luaVM)
35573557
{
35583558
// bool setVehicleModelExhaustPosition(int modelID, float x, float y, float z)
35593559
unsigned short modelID; CVector position;
@@ -3564,7 +3564,7 @@ int CLuaVehicleDefs::SetVehicleModelExhaustPosition(lua_State* luaVM)
35643564

35653565
if (!argStream.HasErrors())
35663566
{
3567-
CClientVehicle::SetModelExhaustPosition(modelID, position);
3567+
CClientVehicle::SetModelExhaustFumesPosition(modelID, position);
35683568

35693569
lua_pushboolean(luaVM, true);
35703570
return 1;
@@ -3576,17 +3576,17 @@ int CLuaVehicleDefs::SetVehicleModelExhaustPosition(lua_State* luaVM)
35763576
return 1;
35773577
}
35783578

3579-
int CLuaVehicleDefs::GetVehicleModelExhaustPosition(lua_State* luaVM)
3579+
int CLuaVehicleDefs::GetVehicleModelExhaustFumesPosition(lua_State* luaVM)
35803580
{
3581-
// bool getVehicleModelExhaustPosition(int modelID, float x, float y, float z)
3581+
// bool getVehicleModelExhaustPosition(int modelID)
35823582
unsigned short modelID;
35833583

35843584
CScriptArgReader argStream(luaVM);
35853585
argStream.ReadNumber(modelID);
35863586

35873587
if (!argStream.HasErrors())
35883588
{
3589-
CVector position = CClientVehicle::GetModelExhaustPosition(modelID);
3589+
CVector position = CClientVehicle::GetModelExhaustFumesPosition(modelID);
35903590

35913591
lua_pushnumber(luaVM, position.fX);
35923592
lua_pushnumber(luaVM, position.fY);

Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ class CLuaVehicleDefs : public CLuaDefs
134134
LUA_DECLARE ( SetHeliBladeCollisionsEnabled );
135135
LUA_DECLARE ( SetVehicleWindowOpen );
136136

137-
LUA_DECLARE(SetVehicleModelExhaustPosition);
138-
LUA_DECLARE(GetVehicleModelExhaustPosition);
137+
LUA_DECLARE(SetVehicleModelExhaustFumesPosition);
138+
LUA_DECLARE(GetVehicleModelExhaustFumesPosition);
139139

140140
// Components
141141
LUA_DECLARE ( SetVehicleComponentPosition );

0 commit comments

Comments
 (0)