Skip to content

Commit ffee407

Browse files
Xenius97Xenius97
committed
remove remaining hungarian notations & fixes
1 parent e7d7763 commit ffee407

File tree

8 files changed

+46
-46
lines changed

8 files changed

+46
-46
lines changed

‎Client/mods/deathmatch/logic/CPacketHandler.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2669,16 +2669,16 @@ void CPacketHandler::Packet_MapInfo(NetBitStreamInterface& bitStream)
26692669
g_pGame->GetWorld()->SetOcclusionsEnabled(bOcclusionsEnabled);
26702670

26712671
// Grass draw distance
2672-
bool bOverrideGrassDrawDistance = false;
2673-
float fGrassCloseDistance, fGrassFarDistance;
2674-
if (!bitStream.ReadBit(bOverrideGrassDrawDistance))
2672+
bool overrideGrassDrawDistance = false;
2673+
float grassCloseDistance, grassFarDistance;
2674+
if (!bitStream.ReadBit(overrideGrassDrawDistance))
26752675
return;
2676-
if (bOverrideGrassDrawDistance)
2676+
if (overrideGrassDrawDistance)
26772677
{
2678-
if (!bitStream.Read(fGrassCloseDistance) || !bitStream.Read(fGrassFarDistance))
2678+
if (!bitStream.Read(grassCloseDistance) || !bitStream.Read(grassFarDistance))
26792679
return;
26802680

2681-
g_pMultiplayer->SetGrassDrawDistance(fGrassCloseDistance, fGrassFarDistance);
2681+
g_pMultiplayer->SetGrassDrawDistance(grassCloseDistance, grassFarDistance);
26822682
}
26832683
}
26842684

‎Client/multiplayer_sa/CMultiplayerSA.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,8 @@ CMultiplayerSA::CMultiplayerSA()
595595
m_fMaddDoggPoolLevel = 1082.73f;
596596
m_dwLastStaticAnimGroupID = eAnimGroup::ANIM_GROUP_DEFAULT;
597597
m_dwLastStaticAnimID = eAnimID::ANIM_ID_WALK;
598-
m_fGrassCloseDistance = DEFAULT_GRASS_CLOSE_DISTANCE;
599-
m_fGrassFarDistance = DEFAULT_GRASS_FAR_DISTANCE;
598+
m_grassCloseDistance = DEFAULT_GRASS_CLOSE_DISTANCE;
599+
m_grassFarDistance = DEFAULT_GRASS_FAR_DISTANCE;
600600
}
601601

602602
CMultiplayerSA::~CMultiplayerSA()
@@ -2070,8 +2070,8 @@ void CMultiplayerSA::RestoreFogDistance()
20702070
void CMultiplayerSA::SetGrassDrawDistance(float closeDistance, float farDistance)
20712071
{
20722072
// Store unscaled values
2073-
m_fGrassCloseDistance = closeDistance;
2074-
m_fGrassFarDistance = farDistance;
2073+
m_grassCloseDistance = closeDistance;
2074+
m_grassFarDistance = farDistance;
20752075

20762076
// Apply FX quality scaling
20772077
// 0 = low, 1 = medium, 2 = high, 3 = very high
@@ -2098,8 +2098,8 @@ void CMultiplayerSA::GetGrassDrawDistance(float& closeDistance, float& farDistan
20982098
void CMultiplayerSA::ResetGrassDrawDistance()
20992099
{
21002100
// Store unscaled default values
2101-
m_fGrassCloseDistance = DEFAULT_GRASS_CLOSE_DISTANCE;
2102-
m_fGrassFarDistance = DEFAULT_GRASS_FAR_DISTANCE;
2101+
m_grassCloseDistance = DEFAULT_GRASS_CLOSE_DISTANCE;
2102+
m_grassFarDistance = DEFAULT_GRASS_FAR_DISTANCE;
21032103

21042104
// Apply FX quality scaling
21052105
// 0 = low, 1 = medium, 2 = high, 3 = very high
@@ -2119,7 +2119,7 @@ void CMultiplayerSA::ResetGrassDrawDistance()
21192119
void CMultiplayerSA::RefreshGrassDrawDistance()
21202120
{
21212121
// Re-apply stored grass distances with current FX quality
2122-
SetGrassDrawDistance(m_fGrassCloseDistance, m_fGrassFarDistance);
2122+
SetGrassDrawDistance(m_grassCloseDistance, m_grassFarDistance);
21232123
}
21242124

21252125
void CMultiplayerSA::GetSunColor(unsigned char& ucCoreRed, unsigned char& ucCoreGreen, unsigned char& ucCoreBlue, unsigned char& ucCoronaRed,

‎Client/multiplayer_sa/CMultiplayerSA.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,8 @@ void InitHooks();
400400
eAnimID m_dwLastStaticAnimID;
401401
DWORD m_dwLastAnimArrayAddress;
402402
float m_fShadowsOffset;
403-
float m_fGrassCloseDistance;
404-
float m_fGrassFarDistance;
403+
float m_grassCloseDistance;
404+
float m_grassFarDistance;
405405

406406
bool m_isRapidVehicleStopFixEnabled{false};
407407

‎Server/mods/deathmatch/logic/CGame.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ CGame::CGame() : m_FloodProtect(4, 30000, 30000) // Max of 4 connecti
219219
m_bOverrideWindVelocity = false;
220220
m_bOverrideFarClip = false;
221221
m_bOverrideFogDistance = false;
222-
m_bOverrideGrassDrawDistance = false;
223-
m_fGrassCloseDistance = 3.0f;
224-
m_fGrassFarDistance = 60.0f;
222+
m_overrideGrassDrawDistance = false;
223+
m_grassCloseDistance = 3.0f;
224+
m_grassFarDistance = 60.0f;
225225
m_bOverrideMoonSize = false;
226226

227227
m_pASE = NULL;

‎Server/mods/deathmatch/logic/CGame.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -404,18 +404,18 @@ class CGame
404404
float GetFogDistance() { return m_fFogDistance; }
405405
void SetFogDistance(float& fFogDistance) { m_fFogDistance = fFogDistance; }
406406

407-
bool HasGrassDrawDistance() const noexcept { return m_bOverrideGrassDrawDistance; }
408-
void SetHasGrassDrawDistance(bool bOverrideGrassDrawDistance) noexcept { m_bOverrideGrassDrawDistance = bOverrideGrassDrawDistance; }
407+
bool HasGrassDrawDistance() const noexcept { return m_overrideGrassDrawDistance; }
408+
void SetHasGrassDrawDistance(bool overrideGrassDrawDistance) noexcept { m_overrideGrassDrawDistance = overrideGrassDrawDistance; }
409409

410410
void GetGrassDrawDistance(float& closeDistance, float& farDistance) const noexcept
411411
{
412-
closeDistance = m_fGrassCloseDistance;
413-
farDistance = m_fGrassFarDistance;
412+
closeDistance = m_grassCloseDistance;
413+
farDistance = m_grassFarDistance;
414414
}
415415
void SetGrassDrawDistance(float closeDistance, float farDistance) noexcept
416416
{
417-
m_fGrassCloseDistance = closeDistance;
418-
m_fGrassFarDistance = farDistance;
417+
m_grassCloseDistance = closeDistance;
418+
m_grassFarDistance = farDistance;
419419
}
420420

421421
float GetAircraftMaxHeight() { return m_fAircraftMaxHeight; }
@@ -654,9 +654,9 @@ class CGame
654654
bool m_bOverrideFogDistance;
655655
float m_fFogDistance;
656656

657-
bool m_bOverrideGrassDrawDistance;
658-
float m_fGrassCloseDistance;
659-
float m_fGrassFarDistance;
657+
bool m_overrideGrassDrawDistance;
658+
float m_grassCloseDistance;
659+
float m_grassFarDistance;
660660

661661
SGarageStates m_bGarageStates;
662662

‎Server/mods/deathmatch/logic/CMapManager.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,9 @@ void CMapManager::OnPlayerJoin(CPlayer& Player)
520520
float fFogDistance = g_pGame->GetFogDistance();
521521

522522
// Grass draw distance
523-
bool bOverrideGrassDrawDistance = g_pGame->HasGrassDrawDistance();
524-
float fGrassCloseDistance, fGrassFarDistance;
525-
g_pGame->GetGrassDrawDistance(fGrassCloseDistance, fGrassFarDistance);
523+
bool overrideGrassDrawDistance = g_pGame->HasGrassDrawDistance();
524+
float grassCloseDistance, grassFarDistance;
525+
g_pGame->GetGrassDrawDistance(grassCloseDistance, grassFarDistance);
526526

527527
marker.Set("FirstBit");
528528

@@ -533,7 +533,7 @@ void CMapManager::OnPlayerJoin(CPlayer& Player)
533533
fJetpackMaxHeight, bOverrideWaterColor, ucWaterRed, ucWaterGreen, ucWaterBlue, ucWaterAlpha, bInteriorSoundsEnabled,
534534
bOverrideRainLevel, fRainLevel, bOverrideSunSize, fSunSize, bOverrideSunColor, ucCoreR, ucCoreG, ucCoreB, ucCoronaR, ucCoronaG,
535535
ucCoronaB, bOverrideWindVelocity, fWindVelX, fWindVelY, fWindVelZ, bOverrideFarClipDistance, fFarClip, bOverrideFogDistance,
536-
fFogDistance, bOverrideGrassDrawDistance, fGrassCloseDistance, fGrassFarDistance, fAircraftMaxHeight, fAircraftMaxVelocity,
536+
fFogDistance, overrideGrassDrawDistance, grassCloseDistance, grassFarDistance, fAircraftMaxHeight, fAircraftMaxVelocity,
537537
bOverrideMoonSize, iMoonSize));
538538

539539
marker.Set("SendMapInfoPacket");

‎Server/mods/deathmatch/logic/packets/CMapInfoPacket.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ CMapInfoPacket::CMapInfoPacket(unsigned char ucWeather, unsigned char ucWeatherB
2727
bool bOverrideRainLevel, float fRainLevel, bool bOverrideSunSize, float fSunSize, bool bOverrideSunColor,
2828
unsigned char ucSunCoreR, unsigned char ucSunCoreG, unsigned char ucSunCoreB, unsigned char ucSunCoronaR,
2929
unsigned char ucSunCoronaG, unsigned char ucSunCoronaB, bool bOverrideWindVelocity, float fWindVelX, float fWindVelY,
30-
float fWindVelZ, bool bOverrideFarClipDistance, float fFarClip, bool bOverrideFogDistance, float fFogDistance,
31-
bool bOverrideGrassDrawDistance, float fGrassCloseDistance, float fGrassFarDistance,
32-
float fAircraftMaxHeight, float fAircraftMaxVelocity, bool bOverrideMoonSize, int iMoonSize)
30+
float fWindVelZ, bool bOverrideFarClipDistance, float fFarClip, bool bOverrideFogDistance, float fFogDistance, float fAircraftMaxHeight,
31+
float fAircraftMaxVelocity, bool bOverrideMoonSize, int iMoonSize, bool overrideGrassDrawDistance, float grassCloseDistance,
32+
float grassFarDistance)
3333
{
3434
m_ucWeather = ucWeather;
3535
m_ucWeatherBlendingTo = ucWeatherBlendingTo;
@@ -81,9 +81,9 @@ CMapInfoPacket::CMapInfoPacket(unsigned char ucWeather, unsigned char ucWeatherB
8181
m_fFarClip = fFarClip;
8282
m_bOverrideFogDistance = bOverrideFogDistance;
8383
m_fFogDistance = fFogDistance;
84-
m_bOverrideGrassDrawDistance = bOverrideGrassDrawDistance;
85-
m_fGrassCloseDistance = fGrassCloseDistance;
86-
m_fGrassFarDistance = fGrassFarDistance;
84+
m_overrideGrassDrawDistance = overrideGrassDrawDistance;
85+
m_grassCloseDistance = grassCloseDistance;
86+
m_grassFarDistance = grassFarDistance;
8787
m_fAircraftMaxHeight = fAircraftMaxHeight;
8888
m_fAircraftMaxVelocity = fAircraftMaxVelocity;
8989
m_bOverrideMoonSize = bOverrideMoonSize;
@@ -362,11 +362,11 @@ bool CMapInfoPacket::Write(NetBitStreamInterface& BitStream) const
362362
BitStream.WriteBit(bOcclusionsEnabled);
363363

364364
// Grass draw distance
365-
BitStream.WriteBit(m_bOverrideGrassDrawDistance);
366-
if (m_bOverrideGrassDrawDistance)
365+
BitStream.WriteBit(m_overrideGrassDrawDistance);
366+
if (m_overrideGrassDrawDistance)
367367
{
368-
BitStream.Write(m_fGrassCloseDistance);
369-
BitStream.Write(m_fGrassFarDistance);
368+
BitStream.Write(m_grassCloseDistance);
369+
BitStream.Write(m_grassFarDistance);
370370
}
371371

372372
return true;

‎Server/mods/deathmatch/logic/packets/CMapInfoPacket.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class CMapInfoPacket final : public CPacket
3939
unsigned char ucSunCoreB = 0, unsigned char ucSunCoronaR = 0, unsigned char ucSunCoronaG = 0, unsigned char ucSunCoronaB = 0,
4040
bool bOverrideWindVelocity = false, float fWindVelX = 0, float fWindVelY = 0, float fWindVelZ = 0,
4141
bool bOverrideFarClipDistance = false, float fFarClip = 0, bool bOverrideFogDistance = false, float fFogDistance = 0,
42-
bool bOverrideGrassDrawDistance = false, float fGrassCloseDistance = 3.0f, float fGrassFarDistance = 60.0f,
43-
float fAircraftMaxHeight = 800, float fAircraftMaxVelocity = 1.5f, bool bOverrideMoonSize = false, int iMoonSize = 3);
42+
float fAircraftMaxHeight = 800, float fAircraftMaxVelocity = 1.5f, bool bOverrideMoonSize = false, int iMoonSize = 3,
43+
bool overrideGrassDrawDistance = false, float grassCloseDistance = 3.0f, float grassFarDistance = 60.0f);
4444

4545
ePacketID GetPacketID() const { return PACKET_ID_MAP_INFO; };
4646
unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; };
@@ -94,9 +94,9 @@ class CMapInfoPacket final : public CPacket
9494
float m_fFarClip;
9595
bool m_bOverrideFogDistance;
9696
float m_fFogDistance;
97-
bool m_bOverrideGrassDrawDistance;
98-
float m_fGrassCloseDistance;
99-
float m_fGrassFarDistance;
97+
bool m_overrideGrassDrawDistance;
98+
float m_grassCloseDistance;
99+
float m_grassFarDistance;
100100
float m_fAircraftMaxHeight;
101101
float m_fAircraftMaxVelocity;
102102
bool m_bOverrideMoonSize;

0 commit comments

Comments
 (0)