From 857937326ece7325fa6b7041937acd73a8d8ee3b Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Sun, 26 Apr 2020 19:24:50 -0700
Subject: [PATCH] Put screen effects render handling inside a function

This de-duplicates the screen effects rendering code by putting it
inside a function, Graphics::renderwithscreeneffects(), and using that
instead of copy-pasted code.
---
 desktop_version/src/Graphics.cpp  | 17 +++++++
 desktop_version/src/Graphics.h    |  1 +
 desktop_version/src/Render.cpp    | 84 +++----------------------------
 desktop_version/src/editor.cpp    | 14 +-----
 desktop_version/src/preloader.cpp | 14 +-----
 5 files changed, 26 insertions(+), 104 deletions(-)

diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index 00c0680a..c7d5584f 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -2667,6 +2667,23 @@ void Graphics::render()
 	}
 }
 
+void Graphics::renderwithscreeneffects()
+{
+	if (game.flashlight > 0 && !game.noflashingmode)
+	{
+		graphics.flashlight();
+	}
+
+	if (game.screenshake > 0 && !game.noflashingmode)
+	{
+		graphics.screenshake();
+	}
+	else
+	{
+		graphics.render();
+	}
+}
+
 void Graphics::bigrprint(int x, int y, std::string& t, int r, int g, int b, bool cen, float sc)
 {
 	if (r < 0) r = 0;
diff --git a/desktop_version/src/Graphics.h b/desktop_version/src/Graphics.h
index 2131312d..6c4e224a 100644
--- a/desktop_version/src/Graphics.h
+++ b/desktop_version/src/Graphics.h
@@ -131,6 +131,7 @@ public:
 	void screenshake();
 
 	void render();
+	void renderwithscreeneffects();
 
 	bool Hitest(SDL_Surface* surface1, point p1, SDL_Surface* surface2, point p2);
 
diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index cb0a64fa..78038fbc 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -1124,19 +1124,7 @@ void titlerender()
 
     graphics.drawfade();
 
-    if (game.flashlight > 0 && !game.noflashingmode)
-    {
-        graphics.flashlight();
-    }
-
-    if (game.screenshake > 0  && !game.noflashingmode)
-    {
-        graphics.screenshake();
-    }
-    else
-    {
-        graphics.render();
-    }
+    graphics.renderwithscreeneffects();
 }
 
 void gamecompleterender()
@@ -1287,19 +1275,7 @@ void gamecompleterender()
 
     graphics.drawfade();
 
-    if (game.flashlight > 0 && !game.noflashingmode)
-    {
-        graphics.flashlight();
-    }
-
-    if (game.screenshake > 0 && !game.noflashingmode)
-    {
-        graphics.screenshake();
-    }
-    else
-    {
-        graphics.render();
-    }
+    graphics.renderwithscreeneffects();
 }
 
 void gamecompleterender2()
@@ -1329,19 +1305,7 @@ void gamecompleterender2()
 
     graphics.drawfade();
 
-    if (game.flashlight > 0 && !game.noflashingmode)
-    {
-        graphics.flashlight();
-    }
-
-    if (game.screenshake > 0 && !game.noflashingmode)
-    {
-        graphics.screenshake();
-    }
-    else
-    {
-        graphics.render();
-    }
+    graphics.renderwithscreeneffects();
 }
 
 void gamerender()
@@ -1697,19 +1661,7 @@ void gamerender()
     }
 
 
-    if (game.flashlight > 0 && !game.noflashingmode)
-    {
-        graphics.flashlight();
-    }
-
-    if (game.screenshake > 0 && !game.noflashingmode)
-    {
-        graphics.screenshake();
-    }
-    else
-    {
-        graphics.render();
-    }
+    graphics.renderwithscreeneffects();
 }
 
 void maprender()
@@ -2510,11 +2462,6 @@ void maprender()
 
     graphics.drawfade();
 
-    if (game.flashlight > 0 && !game.noflashingmode)
-    {
-        graphics.flashlight();
-    }
-
     if (graphics.resumegamemode)
     {
         graphics.menuoffset += 25;
@@ -2548,14 +2495,7 @@ void maprender()
     }
     else
     {
-        if (game.screenshake > 0 && !game.noflashingmode)
-        {
-            graphics.screenshake();
-        }
-        else
-        {
-            graphics.render();
-        }
+        graphics.renderwithscreeneffects();
     }
 }
 
@@ -2685,11 +2625,6 @@ void teleporterrender()
     }
 
 
-    if (game.flashlight > 0 && !game.noflashingmode)
-    {
-        graphics.flashlight();
-    }
-
     if (graphics.resumegamemode)
     {
         graphics.menuoffset += 25;
@@ -2723,13 +2658,6 @@ void teleporterrender()
     }
     else
     {
-        if (game.screenshake > 0 && !game.noflashingmode)
-        {
-            graphics.screenshake();
-        }
-        else
-        {
-            graphics.render();
-        }
+        graphics.renderwithscreeneffects();
     }
 }
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index dedceaf0..38b4bbf3 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -3422,19 +3422,7 @@ void editorrender()
 
     graphics.drawfade();
 
-    if (game.flashlight > 0 && !game.noflashingmode)
-    {
-        graphics.flashlight();
-    }
-
-    if (game.screenshake > 0  && !game.noflashingmode)
-    {
-        graphics.screenshake();
-    }
-    else
-    {
-        graphics.render();
-    }
+    graphics.renderwithscreeneffects();
 }
 
 void editorlogic()
diff --git a/desktop_version/src/preloader.cpp b/desktop_version/src/preloader.cpp
index 6fab8ee4..4c7324e3 100644
--- a/desktop_version/src/preloader.cpp
+++ b/desktop_version/src/preloader.cpp
@@ -95,17 +95,5 @@ void preloaderrender()
 
   graphics.drawfade();
 
-  if (game.flashlight > 0 && !game.noflashingmode)
-  {
-    graphics.flashlight();
-  }
-
-  if (game.screenshake > 0  && !game.noflashingmode)
-  {
-    graphics.screenshake();
-  }
-  else
-  {
-    graphics.render();
-  }
+  graphics.renderwithscreeneffects();
 }