Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 18923a9

Browse files
committed
Rename some methods in PostProcessMan
1 parent 650cc3b commit 18923a9

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

Activities/ActorEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ void ActorEditor::DrawGUI(BITMAP *pTargetBitmap, const Vector &targetPos, int wh
339339
}
340340

341341
// Clear out annoying blooms
342-
g_PostProcessMan.ClearPostEffects();
342+
g_PostProcessMan.ClearScenePostEffects();
343343

344344
m_pPicker->Draw(pTargetBitmap);
345345
m_pPieMenu->Draw(pTargetBitmap, targetPos);

Activities/EditorActivity.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ int EditorActivity::Start()
209209
return error;
210210

211211
// Clear the post effects
212-
g_PostProcessMan.ClearPostEffects();
212+
g_PostProcessMan.ClearScenePostEffects();
213213

214214
// Clear the screen messages
215215
g_FrameMan.ClearScreenText();

Managers/ActivityMan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1699,7 +1699,7 @@ int ActivityMan::StartActivity(Activity *pActivity)
16991699
// g_MovableMan.Update();
17001700

17011701
// Clear the post effects
1702-
g_PostProcessMan.ClearPostEffects();
1702+
g_PostProcessMan.ClearScenePostEffects();
17031703

17041704
// Clear the screen messages
17051705
g_FrameMan.ClearScreenText();

Managers/FrameMan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ namespace RTE {
10041004
int screenCount = (m_HSplit ? 2 : 1) * (m_VSplit ? 2 : 1);
10051005
RTEAssert(screenCount <= 1 || m_PlayerScreen, "Splitscreen surface not ready when needed!");
10061006

1007-
g_PostProcessMan.Reset();
1007+
g_PostProcessMan.ClearScreenPostEffects();
10081008

10091009
// These accumulate the effects for each player's screen area, and are then transferred to the above lists with the player screen offset applied
10101010
list<PostEffect> screenRelativeEffects;

Managers/MovableMan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ void MovableMan::Update()
16491649

16501650
// If this is the first sim update since a drawn one, then clear the post effects
16511651
if (g_TimerMan.SimUpdatesSinceDrawn() == 0)
1652-
g_PostProcessMan.ClearPostEffects();
1652+
g_PostProcessMan.ClearScenePostEffects();
16531653

16541654
// Lua transfer pointer needs to be cleared, what was set here last update isn't valid anymore
16551655
m_pObjectToScriptUpdate = 0;

Managers/PostProcessMan.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ namespace RTE {
6161
/// <summary>
6262
/// Clears the list of registered post-processing screen effects and glow boxes.
6363
/// </summary>
64-
void Reset() { m_PostScreenEffects.clear(); m_PostScreenGlowBoxes.clear(); }
64+
void ClearScreenPostEffects() { m_PostScreenEffects.clear(); m_PostScreenGlowBoxes.clear(); }
6565

6666
/// <summary>
6767
/// Clears the list of registered post-processing scene effects and glow areas.
6868
/// </summary>
69-
void ClearPostEffects() { m_PostSceneEffects.clear(); m_GlowAreas.clear(); }
69+
void ClearScenePostEffects() { m_PostSceneEffects.clear(); m_GlowAreas.clear(); }
7070
#pragma endregion
7171

7272
#pragma region Concrete Methods

Managers/SceneMan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ int SceneMan::LoadScene(Scene *pNewScene, bool placeObjects, bool placeUnits)
184184
// Clear out all the MO's in the scene
185185
g_MovableMan.PurgeAllMOs();
186186
// Clear the post effects
187-
g_PostProcessMan.ClearPostEffects();
187+
g_PostProcessMan.ClearScenePostEffects();
188188

189189
g_NetworkServer.LockScene(true);
190190

0 commit comments

Comments
 (0)