Skip to content

Commit b4c5104

Browse files
XJMLNXJMLN
committed
CR changes
1 parent a384e4b commit b4c5104

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ unsigned char CLuaCameraDefs::GetCameraDrunkLevel()
176176
return g_pGame->GetPlayerInfo()->GetCamDrunkLevel();
177177
}
178178

179-
CLuaMultiReturn<bool, float, float> CLuaCameraDefs::GetCameraUnderwaterEffect()
179+
CLuaMultiReturn<bool, float, float> CLuaCameraDefs::GetCameraUnderwaterEffect() noexcept
180180
{
181181
bool isEnabled;
182182
float speed, frequency;
183183
g_pMultiplayer->GetUnderwaterEffect(isEnabled, speed, frequency);
184184
return {isEnabled, speed, frequency};
185185
}
186186

187-
CLuaMultiReturn<bool, float> CLuaCameraDefs::GetCameraUnderwaterDarkness()
187+
CLuaMultiReturn<bool, float> CLuaCameraDefs::GetCameraUnderwaterDarkness() noexcept
188188
{
189189
bool isEnabled;
190190
float fullDarknessDepth;
@@ -494,7 +494,7 @@ int CLuaCameraDefs::SetCameraGoggleEffect(lua_State* luaVM)
494494
return 1;
495495
}
496496

497-
bool CLuaCameraDefs::SetCameraUnderwaterEffectEnabled(bool bEnabled)
497+
bool CLuaCameraDefs::SetCameraUnderwaterEffectEnabled(bool bEnabled) noexcept
498498
{
499499
g_pMultiplayer->SetUnderwaterEffectEnabled(bEnabled);
500500

@@ -515,14 +515,14 @@ bool CLuaCameraDefs::SetCameraUnderwaterDarkness(bool bEnabled, std::optional<fl
515515
return true;
516516
}
517517

518-
bool CLuaCameraDefs::ResetCameraUnderwaterEffect()
518+
bool CLuaCameraDefs::ResetCameraUnderwaterEffect() noexcept
519519
{
520520
g_pMultiplayer->ResetUnderwaterEffect();
521521

522522
return true;
523523
}
524524

525-
bool CLuaCameraDefs::ResetCameraUnderwaterDarkness()
525+
bool CLuaCameraDefs::ResetCameraUnderwaterDarkness() noexcept
526526
{
527527
g_pMultiplayer->ResetUnderwaterDarkness();
528528

‎Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class CLuaCameraDefs : public CLuaDefs
3131
static std::string GetCameraGoggleEffect();
3232
LUA_DECLARE(GetCameraFieldOfView);
3333
static unsigned char GetCameraDrunkLevel();
34-
static CLuaMultiReturn<bool, float, float> GetCameraUnderwaterEffect();
35-
static CLuaMultiReturn<bool, float> GetCameraUnderwaterDarkness();
34+
static CLuaMultiReturn<bool, float, float> GetCameraUnderwaterEffect() noexcept;
35+
static CLuaMultiReturn<bool, float> GetCameraUnderwaterDarkness() noexcept;
3636

3737
// Cam set funcs
3838
LUA_DECLARE(SetCameraMatrix);
@@ -45,11 +45,11 @@ class CLuaCameraDefs : public CLuaDefs
4545
LUA_DECLARE(SetCameraGoggleEffect);
4646
static bool SetCameraDrunkLevel(short drunkLevel);
4747

48-
static bool SetCameraUnderwaterEffectEnabled(bool isEnabled);
48+
static bool SetCameraUnderwaterEffectEnabled(bool isEnabled) noexcept;
4949
static bool SetCameraUnderwaterEffectSpeed(float speed, float frequency);
5050
static bool SetCameraUnderwaterDarkness(bool isEnabled, std::optional<float> fullDarknessDepth);
51-
static bool ResetCameraUnderwaterEffect();
52-
static bool ResetCameraUnderwaterDarkness();
51+
static bool ResetCameraUnderwaterEffect() noexcept;
52+
static bool ResetCameraUnderwaterDarkness() noexcept;
5353

5454
// For OOP only
5555
LUA_DECLARE(OOP_GetCameraPosition);

‎Client/multiplayer_sa/CMultiplayerSA.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,13 @@ class CMultiplayerSA : public CMultiplayer
201201
bool IsNightVisionEnabled();
202202
bool IsThermalVisionEnabled();
203203

204-
void GetUnderwaterEffect(bool& isEnabled, float& speed, float& frequency);
205-
void GetUnderwaterDarkness(bool& isEnabled, float& fullDarknessDepth);
206-
void SetUnderwaterEffectEnabled(bool isEnabled) override;
207-
void SetUnderwaterEffectSpeed(float speed, float frequency) override;
204+
void GetUnderwaterEffect(bool& isEnabled, float& speed, float& frequency) const noexcept;
205+
void GetUnderwaterDarkness(bool& isEnabled, float& fullDarknessDepth) const noexcept;
206+
void SetUnderwaterEffectEnabled(bool isEnabled) const noexcept override;
207+
void SetUnderwaterEffectSpeed(float speed, float frequency) const noexcept override;
208208
void SetUnderwaterDarkness(bool isEnabled, float fullDarknessDepth) override;
209-
void ResetUnderwaterEffect() override;
210-
void ResetUnderwaterDarkness() override;
209+
void ResetUnderwaterEffect() noexcept override;
210+
void ResetUnderwaterDarkness() noexcept override;
211211

212212
void AllowWindowsCursorShowing(bool bAllow);
213213

‎Client/multiplayer_sa/CMultiplayerSA_Postprocess.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void CMultiplayerSA::SetGrainLevel(BYTE ucLevel)
131131
GrainEffect::dwGrainStrength = static_cast<DWORD>(ucLevel);
132132

133133
if (bEnable == bOverridden)
134-
return;
134+
return;
135135

136136
if (bEnable)
137137
{
@@ -166,31 +166,31 @@ void CMultiplayerSA::SetNightVisionEnabled(bool bEnabled, bool bNoiseEnabled)
166166
}
167167
}
168168

169-
void CMultiplayerSA::SetUnderwaterEffectEnabled(bool isEnabled)
169+
void CMultiplayerSA::SetUnderwaterEffectEnabled(bool isEnabled) const noexcept
170170
{
171-
MemPutFast<uint8_t>(VAR_CPostEffects_WaterEnable, isEnabled ? 1 : 0);
171+
MemPutFast<std::uint8_t>(VAR_CPostEffects_WaterEnable, isEnabled ? 1 : 0);
172172
}
173173

174-
void CMultiplayerSA::SetUnderwaterEffectSpeed(float speed, float frequency)
174+
void CMultiplayerSA::SetUnderwaterEffectSpeed(float speed, float frequency) const noexcept
175175
{
176176
MemPutFast<float>(VAR_CPostEffects_WaterSpeed, speed);
177177
MemPutFast<float>(VAR_CPostEffects_WaterFreq, frequency);
178178
}
179179

180180
void CMultiplayerSA::SetUnderwaterDarkness(bool isEnabled, float fullDarknessDepth)
181181
{
182-
MemPutFast<uint8_t>(VAR_CPostEffects_WaterDepthDarkessEnabled, isEnabled ? 1 : 0);
182+
MemPutFast<std::uint8_t>(VAR_CPostEffects_WaterDepthDarkessEnabled, isEnabled ? 1 : 0);
183183

184184
MemPutFast<float>(VAR_CPostEffects_WaterFullDarknessDepth, fullDarknessDepth);
185185
}
186186

187-
void CMultiplayerSA::ResetUnderwaterEffect()
187+
void CMultiplayerSA::ResetUnderwaterEffect() noexcept
188188
{
189189
this->SetUnderwaterEffectEnabled(false);
190190
this->SetUnderwaterEffectSpeed(DEFAULT_UNDERWATER_EFFECT_SPEED, DEFAULT_UNDERWATER_EFFECT_FREQUENCY);
191191
}
192192

193-
void CMultiplayerSA::ResetUnderwaterDarkness()
193+
void CMultiplayerSA::ResetUnderwaterDarkness() noexcept
194194
{
195195
this->SetUnderwaterDarkness(false, DEFAULT_UNDERWATER_FULL_DARKNESS_DEPTH);
196196
}
@@ -225,16 +225,16 @@ bool CMultiplayerSA::IsThermalVisionEnabled()
225225
return (*(BYTE*)0xC402B9 == 1);
226226
}
227227

228-
void CMultiplayerSA::GetUnderwaterEffect(bool& isEnabled, float& speed, float& frequency)
228+
void CMultiplayerSA::GetUnderwaterEffect(bool& isEnabled, float& speed, float& frequency) const noexcept
229229
{
230230
isEnabled = (*(uint8_t*)VAR_CPostEffects_WaterEnable == 1) || (*(float*)VAR_CWeather_UnderWaterness) >= (*(float*)VAR_CPostEffects_WaterFxStartUnderWaterness);
231231
speed = (*(float*)VAR_CPostEffects_WaterSpeed);
232232
frequency = (*(float*)VAR_CPostEffects_WaterFreq);
233233
}
234234

235-
void CMultiplayerSA::GetUnderwaterDarkness(bool& isEnabled, float& fullDarknessDepth)
235+
void CMultiplayerSA::GetUnderwaterDarkness(bool& isEnabled, float& fullDarknessDepth) const noexcept
236236
{
237-
isEnabled = (*(uint8_t*)VAR_CPostEffects_WaterDepthDarkessEnabled);
237+
isEnabled = (*(std::uint8_t*)VAR_CPostEffects_WaterDepthDarkessEnabled);
238238
fullDarknessDepth = (*(float*)VAR_CPostEffects_WaterFullDarknessDepth);
239239
}
240240

0 commit comments

Comments
 (0)