From 7deb3ed4bd0227d6a83d38aaa0a6f1d07d12c3c6 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 11 Oct 2020 11:41:49 +0200 Subject: [PATCH] - Duke: got rid of the last 3 remaining #defines not used for list generation, as well. --- source/games/duke/src/duke3d.h | 4 +--- source/games/duke/src/global.h | 2 +- source/games/duke/src/interpolate.cpp | 3 --- source/games/duke/src/sounds.h | 5 +---- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/source/games/duke/src/duke3d.h b/source/games/duke/src/duke3d.h index a13d7604b..e1652c96d 100644 --- a/source/games/duke/src/duke3d.h +++ b/source/games/duke/src/duke3d.h @@ -1,5 +1,4 @@ -#ifndef duke3d_h_ -#define duke3d_h_ +#pragma once #include "build.h" @@ -125,4 +124,3 @@ extern Dispatcher fi; END_DUKE_NS -#endif diff --git a/source/games/duke/src/global.h b/source/games/duke/src/global.h index e9a6d7b1f..fa157b52e 100644 --- a/source/games/duke/src/global.h +++ b/source/games/duke/src/global.h @@ -15,7 +15,7 @@ BEGIN_DUKE_NS extern user_defs ud; // Interpolation code is the same in all games with slightly different naming - this needs to be unified and cleaned up. // Interpolations are reconstructed on load and do not need to be saved. -#define MAXINTERPOLATIONS MAXSPRITES +enum { MAXINTERPOLATIONS = MAXSPRITES }; extern int numinterpolations; extern int* curipos[MAXINTERPOLATIONS]; extern int bakipos[MAXINTERPOLATIONS]; diff --git a/source/games/duke/src/interpolate.cpp b/source/games/duke/src/interpolate.cpp index 82a5f32b9..c5368bb2f 100644 --- a/source/games/duke/src/interpolate.cpp +++ b/source/games/duke/src/interpolate.cpp @@ -37,9 +37,6 @@ source as it is released. BEGIN_DUKE_NS - -#define MAXINTERPOLATIONS MAXSPRITES - int32_t numinterpolations; int32_t g_interpolationLock; int32_t oldipos[MAXINTERPOLATIONS]; diff --git a/source/games/duke/src/sounds.h b/source/games/duke/src/sounds.h index 9421b8310..0bc7891bd 100644 --- a/source/games/duke/src/sounds.h +++ b/source/games/duke/src/sounds.h @@ -3,9 +3,7 @@ // sounds.h // //**************************************************************************** - -#ifndef sounds_public_h_ -#define sounds_public_h_ +#pragma once #include "raze_sound.h" #include "raze_music.h" @@ -81,4 +79,3 @@ extern TArray specialmusic; END_DUKE_NS -#endif