From feb65bcb990d699a9f9a35a625d3f58eefaf67d6 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 25 Apr 2022 17:30:57 +0200 Subject: [PATCH] - moved wipe code into the backend --- src/CMakeLists.txt | 2 +- src/{rendering/2d/f_wipe.cpp => common/2d/wipe.cpp} | 2 +- src/{rendering/2d/f_wipe.h => common/2d/wipe.h} | 0 src/d_main.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/{rendering/2d/f_wipe.cpp => common/2d/wipe.cpp} (99%) rename src/{rendering/2d/f_wipe.h => common/2d/wipe.h} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c1bb8495d..e68950fce 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -953,7 +953,6 @@ set (PCH_SOURCES g_statusbar/sbarinfo.cpp g_statusbar/sbar_mugshot.cpp g_statusbar/shared_sbar.cpp - rendering/2d/f_wipe.cpp rendering/2d/v_blend.cpp rendering/hwrenderer/hw_entrypoint.cpp rendering/hwrenderer/hw_vertexbuilder.cpp @@ -1036,6 +1035,7 @@ set (PCH_SOURCES common/2d/v_2ddrawer.cpp common/2d/v_drawtext.cpp common/2d/v_draw.cpp + common/2d/wipe.cpp common/thirdparty/gain_analysis.cpp common/thirdparty/sfmt/SFMT.cpp common/fonts/singlelumpfont.cpp diff --git a/src/rendering/2d/f_wipe.cpp b/src/common/2d/wipe.cpp similarity index 99% rename from src/rendering/2d/f_wipe.cpp rename to src/common/2d/wipe.cpp index 2dd40891f..7de5f1cf7 100644 --- a/src/rendering/2d/f_wipe.cpp +++ b/src/common/2d/wipe.cpp @@ -35,7 +35,7 @@ #include "v_video.h" #include "m_random.h" -#include "f_wipe.h" +#include "wipe.h" #include "bitmap.h" #include "hw_material.h" diff --git a/src/rendering/2d/f_wipe.h b/src/common/2d/wipe.h similarity index 100% rename from src/rendering/2d/f_wipe.h rename to src/common/2d/wipe.h diff --git a/src/d_main.cpp b/src/d_main.cpp index d534b9620..a8f0db37a 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -54,7 +54,7 @@ #include "s_sound.h" #include "v_video.h" #include "intermission/intermission.h" -#include "f_wipe.h" +#include "wipe.h" #include "m_argv.h" #include "m_misc.h" #include "menu.h"