Skip to content

Commit ae4eda9

Browse files
committed
review
1 parent 82847b6 commit ae4eda9

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

Server/mods/deathmatch/logic/CVehicle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ class CVehicle final : public CElement
499499
unsigned char m_ucVariant2;
500500

501501
bool m_onFire;
502-
float m_nitroLevel;
502+
float m_nitroLevel {0.0f};
503503

504504
CTickCount m_LastPushedTime;
505505
CVector m_vecStationaryCheckPosition;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3070,12 +3070,10 @@ bool CLuaVehicleDefs::SetVehicleNitroActivated(CVehicle* vehicle, bool state) no
30703070

30713071
float CLuaVehicleDefs::GetVehicleNitroLevel(CVehicle* vehicle) noexcept
30723072
{
3073-
float fLevel;
3074-
fLevel = vehicle->GetNitroLevel();
3073+
float fLevel = vehicle->GetNitroLevel();
30753074

30763075
if (fLevel < 0)
30773076
fLevel = 1 + fLevel;
30783077

30793078
return fLevel;
3080-
30813079
}

Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ bool CSimVehiclePuresyncPacket::Read(NetBitStreamInterface& BitStream)
260260
if (!BitStream.Read(vehicleNitro))
261261
return false;
262262

263-
m_Cache.VehNitroLevel = vehicleNitro;
263+
m_Cache.vehNitroLevel = vehicleNitro;
264264
}
265265

266266

@@ -436,7 +436,7 @@ bool CSimVehiclePuresyncPacket::Write(NetBitStreamInterface& BitStream) const
436436

437437

438438
if (BitStream.Can(eBitStreamVersion::IsVehicleNitroActivated_Serverside))
439-
BitStream.Write(m_Cache.VehNitroLevel);
439+
BitStream.Write(m_Cache.vehNitroLevel);
440440

441441
// Success
442442
return true;

Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class CSimVehiclePuresyncPacket : public CSimPacket
7575
CVector VehTurnSpeed;
7676

7777
float fVehHealth;
78-
float VehNitroLevel;
78+
float vehNitroLevel;
7979

8080
std::vector<STrailerInfo> TrailerList;
8181

Server/mods/deathmatch/logic/packets/CVehiclePuresyncPacket.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,13 @@ bool CVehiclePuresyncPacket::Read(NetBitStreamInterface& BitStream)
454454
if (BitStream.Can(eBitStreamVersion::SetElementOnFire))
455455
pVehicle->SetOnFire(BitStream.ReadBit());
456456

457-
if (BitStream.Can(eBitStreamVersion::IsVehicleNitroActivated_Serverside))
457+
if (BitStream.Can(eBitStreamVersion::IsVehicleNitroActivated_Serverside))
458458
{
459459
float vehicleNitro;
460460
if (!BitStream.Read(vehicleNitro))
461461
return false;
462462

463463
pVehicle->SetNitroLevel(vehicleNitro);
464-
465464
}
466465

467466
// Success

Shared/sdk/net/bitstream.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,8 @@ enum class eBitStreamVersion : unsigned short
608608
// 2025-01-10
609609
WorldSpecialProperty_FlyingComponents,
610610

611+
//2025-01-16
612+
//Add isVehicleNitroActivated and getVehicleNitroLevel Server side
611613
IsVehicleNitroActivated_Serverside,
612614

613615
// This allows us to automatically increment the BitStreamVersion when things are added to this enum.

0 commit comments

Comments
 (0)