Skip to content

Commit

Permalink
Revert "Add spawnFlyingComponent & breakGlass arguments for setVehicl…
Browse files Browse the repository at this point in the history 
…ePanelState (PR #3572)"

This reverts commit 5b69d70.
  • Loading branch information
@botder
botder committed Dec 31, 2024
1 parent 5b69d70 commit e831f62
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 71 deletions.
17 changes: 13 additions & 4 deletions Client/game_sa/CDamageManagerSA.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void CDamageManagerSA::SetWheelStatus(eWheelPosition bWheel, BYTE bTireStatus)
}
}

void CDamageManagerSA::SetPanelStatus(BYTE bPanel, BYTE bPanelStatus, bool spawnFlyingComponent, bool breakGlass)
void CDamageManagerSA::SetPanelStatus(BYTE bPanel, BYTE bPanelStatus)
{
// Valid index?
if (bPanel < MAX_PANELS && bPanelStatus <= 3)
Expand Down Expand Up @@ -140,19 +140,28 @@ void CDamageManagerSA::SetPanelStatus(BYTE bPanel, BYTE bPanelStatus, bool spawn
else
{
// Call CAutomobile::SetPanelDamage to update the vehicle
((void(__thiscall*)(CEntitySAInterface*, int, bool, bool))0x6B1480)(internalEntityInterface, dwPanel, bPanel == ePanels::WINDSCREEN_PANEL && breakGlass, !spawnFlyingComponent);
dwFunction = 0x6B1480;
dwThis = (DWORD)internalEntityInterface;
bool bUnknown = false;
_asm
{
mov ecx, dwThis
push bUnknown
push dwPanel
call dwFunction
}
}
}
}
}

void CDamageManagerSA::SetPanelStatus(unsigned long ulStatus, bool spawnFlyingComponent, bool breakGlass)
void CDamageManagerSA::SetPanelStatus(unsigned long ulStatus)
{
unsigned int uiIndex;

for (uiIndex = 0; uiIndex < MAX_PANELS; uiIndex++)
{
SetPanelStatus(static_cast<eDoors>(uiIndex), static_cast<unsigned char>(ulStatus), spawnFlyingComponent, breakGlass);
SetPanelStatus(static_cast<eDoors>(uiIndex), static_cast<unsigned char>(ulStatus));
ulStatus >>= 4;
}
}
Expand Down
4 changes: 2 additions & 2 deletions Client/game_sa/CDamageManagerSA.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class CDamageManagerSA : public CDamageManager
void SetWheelStatus(eWheelPosition bWheel, BYTE bTireStatus);
BYTE GetPanelStatus(BYTE bPanel);
unsigned long GetPanelStatus();
void SetPanelStatus(BYTE bPanel, BYTE bPanelStatus, bool spawnFlyingComponent = true, bool breakGlass = false);
void SetPanelStatus(unsigned long ulStatus, bool spawnFlyingComponent = true, bool breakGlass = false);
void SetPanelStatus(BYTE bPanel, BYTE bPanelStatus);
void SetPanelStatus(unsigned long ulStatus);
BYTE GetLightStatus(BYTE bLight);
unsigned char GetLightStatus();
void SetLightStatus(BYTE bLight, BYTE bLightStatus);
Expand Down
4 changes: 2 additions & 2 deletions Client/mods/deathmatch/logic/CClientVehicle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1521,12 +1521,12 @@ bool CClientVehicle::GetWheelMissing(unsigned char ucWheel, const SString& strWh
return false;
}

void CClientVehicle::SetPanelStatus(unsigned char ucPanel, unsigned char ucStatus, bool spawnFlyingComponent, bool breakGlass)
void CClientVehicle::SetPanelStatus(unsigned char ucPanel, unsigned char ucStatus)
{
if (ucPanel < MAX_PANELS)
{
if (m_pVehicle && HasDamageModel())
m_pVehicle->GetDamageManager()->SetPanelStatus(static_cast<ePanels>(ucPanel), ucStatus, spawnFlyingComponent, breakGlass);
m_pVehicle->GetDamageManager()->SetPanelStatus(static_cast<ePanels>(ucPanel), ucStatus);

m_ucPanelStates[ucPanel] = ucStatus;
}
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/CClientVehicle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ class CClientVehicle : public CClientStreamElement

void SetDoorStatus(unsigned char ucDoor, unsigned char ucStatus, bool spawnFlyingComponent);
void SetWheelStatus(unsigned char ucWheel, unsigned char ucStatus, bool bSilent = true);
void SetPanelStatus(unsigned char ucPanel, unsigned char ucStatus, bool spawnFlyingComponent = true, bool breakGlass = false);
void SetPanelStatus(unsigned char ucPanel, unsigned char ucStatus);
void SetLightStatus(unsigned char ucLight, unsigned char ucStatus);
bool GetWheelMissing(unsigned char ucWheel, const SString& strWheelName = "");

Expand Down
6 changes: 3 additions & 3 deletions Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3197,17 +3197,17 @@ bool CStaticFunctionDefinitions::SetVehicleLightState(CClientEntity& Entity, uns
return false;
}

bool CStaticFunctionDefinitions::SetVehiclePanelState(CClientEntity& Entity, unsigned char ucPanel, unsigned char ucState, bool spawnFlyingComponent, bool breakGlass)
bool CStaticFunctionDefinitions::SetVehiclePanelState(CClientEntity& Entity, unsigned char ucPanel, unsigned char ucState)
{
RUN_CHILDREN(SetVehiclePanelState(**iter, ucPanel, ucState, spawnFlyingComponent, breakGlass))
RUN_CHILDREN(SetVehiclePanelState(**iter, ucPanel, ucState))

if (IS_VEHICLE(&Entity))
{
CClientVehicle& Vehicle = static_cast<CClientVehicle&>(Entity);

if (ucPanel < 7)
{
Vehicle.SetPanelStatus(ucPanel, ucState, spawnFlyingComponent, breakGlass);
Vehicle.SetPanelStatus(ucPanel, ucState);
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class CStaticFunctionDefinitions
static bool SetVehicleDoorState(CClientEntity& Entity, unsigned char ucDoor, unsigned char ucState, bool spawnFlyingComponent);
static bool SetVehicleWheelStates(CClientEntity& Entity, int iFrontLeft, int iRearLeft = -1, int iFrontRight = -1, int iRearRight = -1);
static bool SetVehicleLightState(CClientEntity& Entity, unsigned char ucLight, unsigned char ucState);
static bool SetVehiclePanelState(CClientEntity& Entity, unsigned char ucPanel, unsigned char ucState, bool spawnFlyingComponent = true, bool breakGlass = false);
static bool SetVehiclePanelState(CClientEntity& Entity, unsigned char ucPanel, unsigned char ucState);
static bool SetVehicleOverrideLights(CClientEntity& Entity, unsigned char ucLights);
static bool AttachTrailerToVehicle(CClientVehicle& Vehicle, CClientVehicle& Trailer, const CVector& vecRotationOffsetDegrees);
static bool DetachTrailerFromVehicle(CClientVehicle& Vehicle, CClientVehicle* pTrailer = NULL);
Expand Down
5 changes: 1 addition & 4 deletions Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1956,17 +1956,14 @@ int CLuaVehicleDefs::SetVehiclePanelState(lua_State* luaVM)
{
CClientEntity* pEntity = NULL;
unsigned char ucPanel = 0, ucState = 0;
bool spawnFlyingComponent, breakGlass;
CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pEntity);
argStream.ReadNumber(ucPanel);
argStream.ReadNumber(ucState);
argStream.ReadBool(spawnFlyingComponent, true);
argStream.ReadBool(breakGlass, false);

if (!argStream.HasErrors())
{
if (CStaticFunctionDefinitions::SetVehiclePanelState(*pEntity, ucPanel, ucState, spawnFlyingComponent, breakGlass))
if (CStaticFunctionDefinitions::SetVehiclePanelState(*pEntity, ucPanel, ucState))
{
lua_pushboolean(luaVM, true);
return 1;
Expand Down
10 changes: 1 addition & 9 deletions Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,15 +352,7 @@ void CVehicleRPCs::SetVehicleDamageState(CClientEntity* pSource, NetBitStreamInt
unsigned char ucPanel, ucState;
if (bitStream.Read(ucPanel) && bitStream.Read(ucState))
{
bool spawnFlyingComponent = true;
bool breakGlass = false;
if (bitStream.Can(eBitStreamVersion::SetVehiclePanelState_SpawnFlyingComponent))
{
bitStream.ReadBit(spawnFlyingComponent);
bitStream.ReadBit(breakGlass);
}

pVehicle->SetPanelStatus(ucPanel, ucState, spawnFlyingComponent, breakGlass);
pVehicle->SetPanelStatus(ucPanel, ucState);
}
}
default:
Expand Down
28 changes: 0 additions & 28 deletions Client/multiplayer_sa/CMultiplayerSA_Vehicles.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,33 +107,6 @@ static void _declspec(naked) HOOK_CAEVehicleAudioEntity__Initialise()
}
}

//////////////////////////////////////////////////////////////////////////////////////////
// CAutomobile::SetPanelDamage
//
// This hook allows determining whether flying components should be spawned
//////////////////////////////////////////////////////////////////////////////////////////
#define HOOKPOS_CAutomobile_SetPanelDamage 0x6B15BE
#define HOOKSIZE_CAutomobile_SetPanelDamage 5
static DWORD SPAWN_FLYING_COMPONENTS = 0x6B15C3;
static DWORD SKIP_FLYING_COMPONENTS = 0x6B15DA;
static void _declspec(naked) HOOK_CAutomobile_SetPanelDamage()
{
_asm
{
mov al, byte ptr [esp+1Ch]
test al, al
jnz skipFlyingComponents

push 5
push ebp
mov ecx, esi
jmp SPAWN_FLYING_COMPONENTS

skipFlyingComponents:
jmp SKIP_FLYING_COMPONENTS
}
}

//////////////////////////////////////////////////////////////////////////////////////////
//
// CMultiplayerSA::InitHooks_Vehicles
Expand All @@ -145,5 +118,4 @@ void CMultiplayerSA::InitHooks_Vehicles()
{
EZHookInstall(CDamageManager__ProgressDoorDamage);
EZHookInstall(CAEVehicleAudioEntity__Initialise);
EZHookInstall(CAutomobile_SetPanelDamage);
}
4 changes: 2 additions & 2 deletions Client/sdk/game/CDamageManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ class CDamageManager
virtual void SetWheelStatus(eWheelPosition bTire, BYTE bTireStatus) = 0;
virtual BYTE GetPanelStatus(BYTE bPanel) = 0;
virtual unsigned long GetPanelStatus() = 0;
virtual void SetPanelStatus(BYTE bPanel, BYTE bPanelStatus, bool spawnFlyingComponent = true, bool breakGlass = false) = 0;
virtual void SetPanelStatus(unsigned long ulStatus, bool spawnFlyingComponent = true, bool breakGlass = false) = 0;
virtual void SetPanelStatus(BYTE bPanel, BYTE bPanelStatus) = 0;
virtual void SetPanelStatus(unsigned long ulStatus) = 0;
virtual BYTE GetLightStatus(BYTE bLight) = 0;
virtual unsigned char GetLightStatus() = 0;
virtual void SetLightStatus(BYTE bLight, BYTE bLightStatus) = 0;
Expand Down
6 changes: 2 additions & 4 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6719,10 +6719,10 @@ bool CStaticFunctionDefinitions::SetVehicleLightState(CElement* pElement, unsign
return false;
}

bool CStaticFunctionDefinitions::SetVehiclePanelState(CElement* pElement, unsigned char ucPanel, unsigned char ucState, bool spawnFlyingComponent, bool breakGlass)
bool CStaticFunctionDefinitions::SetVehiclePanelState(CElement* pElement, unsigned char ucPanel, unsigned char ucState)
{
assert(pElement);
RUN_CHILDREN(SetVehiclePanelState(*iter, ucPanel, ucState, spawnFlyingComponent, breakGlass))
RUN_CHILDREN(SetVehiclePanelState(*iter, ucPanel, ucState))

if (IS_VEHICLE(pElement))
{
Expand All @@ -6739,8 +6739,6 @@ bool CStaticFunctionDefinitions::SetVehiclePanelState(CElement* pElement, unsign
BitStream.pBitStream->Write(ucObject);
BitStream.pBitStream->Write(ucPanel);
BitStream.pBitStream->Write(ucState);
BitStream.pBitStream->WriteBit(spawnFlyingComponent);
BitStream.pBitStream->WriteBit(breakGlass);
m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pVehicle, SET_VEHICLE_DAMAGE_STATE, *BitStream.pBitStream));
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ class CStaticFunctionDefinitions
static bool SetVehicleDoorState(CElement* pElement, unsigned char ucDoor, unsigned char ucState, bool spawnFlyingComponent);
static bool SetVehicleWheelStates(CElement* pElement, int iFrontLeft, int iRearLeft = -1, int iFrontRight = -1, int iRearRight = -1);
static bool SetVehicleLightState(CElement* pElement, unsigned char ucLight, unsigned char ucState);
static bool SetVehiclePanelState(CElement* pElement, unsigned char ucPanel, unsigned char ucState, bool spawnFlyingComponent = true, bool breakGlass = false);
static bool SetVehiclePanelState(CElement* pElement, unsigned char ucPanel, unsigned char ucState);
static bool SetVehicleIdleRespawnDelay(CElement* pElement, unsigned long ulTime);
static bool SetVehicleRespawnDelay(CElement* pElement, unsigned long ulTime);
static bool GetVehicleRespawnPosition(CElement* pElement, CVector& vecPosition);
Expand Down
6 changes: 1 addition & 5 deletions Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2125,19 +2125,15 @@ int CLuaVehicleDefs::SetVehiclePanelState(lua_State* luaVM)
CElement* pElement;
unsigned char ucPanel;
unsigned char ucState;
bool spawnFlyingComponent;
bool breakGlass;

CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pElement);
argStream.ReadNumber(ucPanel);
argStream.ReadNumber(ucState);
argStream.ReadBool(spawnFlyingComponent, true);
argStream.ReadBool(breakGlass, false);

if (!argStream.HasErrors())
{
if (CStaticFunctionDefinitions::SetVehiclePanelState(pElement, ucPanel, ucState, spawnFlyingComponent, breakGlass))
if (CStaticFunctionDefinitions::SetVehiclePanelState(pElement, ucPanel, ucState))
{
lua_pushboolean(luaVM, true);
return 1;
Expand Down
6 changes: 1 addition & 5 deletions Shared/sdk/net/bitstream.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,13 +589,9 @@ enum class eBitStreamVersion : unsigned short
WorldSpecialPropertyEvent,

// Add setElementOnFire function
// 2024-12-30
// 2024-30-12
SetElementOnFire,

// Add "spawnFlyingComponent" to setVehiclePanelState
// 2024-12-31
SetVehiclePanelState_SpawnFlyingComponent,

// This allows us to automatically increment the BitStreamVersion when things are added to this enum.
// Make sure you only add things above this comment.
Next,
Expand Down

1 comment on commit e831f62

@botder
Copy link
Member Author

@botder botder commented on e831f62 Dec 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This used to crash the game when a vehicle was being streamed in, but not in every case.

Please sign in to comment.