diff --git a/source/common/rendering/gl/gl_framebuffer.cpp b/source/common/rendering/gl/gl_framebuffer.cpp index 6ea31e5bd..4b20db68f 100644 --- a/source/common/rendering/gl/gl_framebuffer.cpp +++ b/source/common/rendering/gl/gl_framebuffer.cpp @@ -63,7 +63,6 @@ #include "hw_cvars.h" EXTERN_CVAR (Bool, vid_vsync) -EXTERN_CVAR(Bool, r_drawvoxels) EXTERN_CVAR(Int, gl_tonemap) EXTERN_CVAR(Bool, cl_capfps) EXTERN_CVAR(Int, gl_pipeline_depth); diff --git a/source/common/rendering/gles/gles_framebuffer.cpp b/source/common/rendering/gles/gles_framebuffer.cpp index 0d0a459c0..bbade7896 100644 --- a/source/common/rendering/gles/gles_framebuffer.cpp +++ b/source/common/rendering/gles/gles_framebuffer.cpp @@ -61,7 +61,6 @@ #include "hw_cvars.h" EXTERN_CVAR (Bool, vid_vsync) -EXTERN_CVAR(Bool, r_drawvoxels) EXTERN_CVAR(Int, gl_tonemap) EXTERN_CVAR(Bool, cl_capfps) EXTERN_CVAR(Int, gl_pipeline_depth); diff --git a/source/common/rendering/vulkan/system/vk_renderdevice.cpp b/source/common/rendering/vulkan/system/vk_renderdevice.cpp index 8f4f1b737..7ef3e5531 100644 --- a/source/common/rendering/vulkan/system/vk_renderdevice.cpp +++ b/source/common/rendering/vulkan/system/vk_renderdevice.cpp @@ -68,7 +68,6 @@ FString JitCaptureStackTrace(int framesToSkip, bool includeNativeFrames, int maxFrames = -1); -EXTERN_CVAR(Bool, r_drawvoxels) EXTERN_CVAR(Int, gl_tonemap) EXTERN_CVAR(Int, screenblocks) EXTERN_CVAR(Bool, cl_capfps) diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp index ad06ee997..0d6b5bd0c 100644 --- a/source/games/duke/src/spawn.cpp +++ b/source/games/duke/src/spawn.cpp @@ -236,7 +236,7 @@ bool initspriteforspawn(DDukeActor* act) auto sa = &ScriptCode[coninf->scriptaddress]; act->curAction = &actions[sa[1]]; act->curMove = &moves[sa[2]]; - int s3 = ScriptCode[sa[3]]; + int s3 = sa[3]; if (s3 && act->spr.hitag == 0) act->spr.hitag = s3; }