From 20184e1e99feae0964d14efd911dae08133157c9 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 29 Dec 2018 12:52:34 +0100 Subject: [PATCH] - removed some unused bits of code. --- src/g_shared/a_morph.cpp | 16 +--------------- src/g_statusbar/sbar.h | 1 - src/g_statusbar/sbar_mugshot.cpp | 10 ---------- src/gl/renderer/gl_renderstate.cpp | 1 - src/gl/renderer/gl_renderstate.h | 1 - 5 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/g_shared/a_morph.cpp b/src/g_shared/a_morph.cpp index d917df3d4d..80e6807af5 100644 --- a/src/g_shared/a_morph.cpp +++ b/src/g_shared/a_morph.cpp @@ -19,23 +19,9 @@ // #include "info.h" -#include "a_pickups.h" -#include "p_local.h" -#include "gi.h" -#include "a_sharedglobal.h" -#include "sbar.h" -#include "a_morph.h" -#include "doomstat.h" -#include "serializer.h" -#include "p_enemy.h" -#include "d_player.h" -#include "r_data/sprites.h" -#include "g_levellocals.h" +#include "actor.h" #include "vm.h" -static FRandom pr_morphmonst ("MorphMonster"); - - bool P_MorphActor(AActor *activator, AActor *victim, PClassActor *ptype, PClassActor *mtype, int duration, int style, PClassActor *enter_flash, PClassActor *exit_flash) { IFVIRTUALPTR(victim, AActor, Morph) diff --git a/src/g_statusbar/sbar.h b/src/g_statusbar/sbar.h index c198f1b940..963c975978 100644 --- a/src/g_statusbar/sbar.h +++ b/src/g_statusbar/sbar.h @@ -251,7 +251,6 @@ struct FMugShotState TArray Frames; FMugShotState(FName name); - ~FMugShotState(); void Tick(); void Reset(); FMugShotFrame &GetCurrentFrame() { return Frames[Position]; } diff --git a/src/g_statusbar/sbar_mugshot.cpp b/src/g_statusbar/sbar_mugshot.cpp index cf3c1f0095..d6201418e2 100644 --- a/src/g_statusbar/sbar_mugshot.cpp +++ b/src/g_statusbar/sbar_mugshot.cpp @@ -126,16 +126,6 @@ FMugShotState::FMugShotState(FName name) Random = M_Random(); } -//=========================================================================== -// -// MugShotState destructor -// -//=========================================================================== - -FMugShotState::~FMugShotState() -{ -} - //=========================================================================== // // FMugShotState :: Tick diff --git a/src/gl/renderer/gl_renderstate.cpp b/src/gl/renderer/gl_renderstate.cpp index 7664db1c5e..9af56aac8a 100644 --- a/src/gl/renderer/gl_renderstate.cpp +++ b/src/gl/renderer/gl_renderstate.cpp @@ -48,7 +48,6 @@ namespace OpenGLRenderer FGLRenderState gl_RenderState; static VSMatrix identityMatrix(1); -TArray gl_MatrixStack; static void matrixToGL(const VSMatrix &mat, int loc) { diff --git a/src/gl/renderer/gl_renderstate.h b/src/gl/renderer/gl_renderstate.h index 25b4420f38..f72b1a61ef 100644 --- a/src/gl/renderer/gl_renderstate.h +++ b/src/gl/renderer/gl_renderstate.h @@ -39,7 +39,6 @@ namespace OpenGLRenderer class FShader; struct GLSectorPlane; -extern TArray gl_MatrixStack; enum EPassType {