From b5dc5ceb3c7656a762bf92650b04d06472065ee2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 26 Apr 2017 14:48:33 +0200 Subject: [PATCH] - removed some unused static variables --- src/c_console.cpp | 1 - src/c_consolebuffer.cpp | 1 - src/gl/compatibility/gl_20.cpp | 2 -- src/gl/scene/gl_flats.cpp | 2 +- src/gl/scene/gl_portal.cpp | 2 -- src/p_acs.cpp | 1 - src/zstrformat.cpp | 1 - 7 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/c_console.cpp b/src/c_console.cpp index ff3f86b20..12be59818 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -1809,7 +1809,6 @@ static const char bar2[] = TEXTCOLOR_RED "\n\35\36\36\36\36\36\36\36\36\36\36\36 "\36\36\36\36\36\36\36\36\36\36\36\36\37" TEXTCOLOR_GREEN "\n"; static const char bar3[] = TEXTCOLOR_RED "\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36" "\36\36\36\36\36\36\36\36\36\36\36\36\37" TEXTCOLOR_NORMAL "\n"; -static const char logbar[] = "\n<------------------------------->\n"; void C_MidPrint (FFont *font, const char *msg) { diff --git a/src/c_consolebuffer.cpp b/src/c_consolebuffer.cpp index 3f64f34e4..0b501a774 100644 --- a/src/c_consolebuffer.cpp +++ b/src/c_consolebuffer.cpp @@ -239,7 +239,6 @@ static const char bar2[] = TEXTCOLOR_RED "\35\36\36\36\36\36\36\36\36\36\36\36\3 "\36\36\36\36\36\36\36\36\36\36\36\36\37" TEXTCOLOR_GREEN "\n"; static const char bar3[] = TEXTCOLOR_RED "\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36" "\36\36\36\36\36\36\36\36\36\36\36\36\37" TEXTCOLOR_NORMAL "\n"; -static const char logbar[] = "\n<------------------------------->\n"; void FConsoleBuffer::AddMidText(const char *string, bool bold, FILE *Logfile) { diff --git a/src/gl/compatibility/gl_20.cpp b/src/gl/compatibility/gl_20.cpp index c8b561bc6..d29823b75 100644 --- a/src/gl/compatibility/gl_20.cpp +++ b/src/gl/compatibility/gl_20.cpp @@ -130,8 +130,6 @@ void gl_PatchMenu() void gl_SetTextureMode(int type) { - static float white[] = {1.f,1.f,1.f,1.f}; - if (type == TM_MASK) { glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); diff --git a/src/gl/scene/gl_flats.cpp b/src/gl/scene/gl_flats.cpp index 0d14378af..c7ab0eeb2 100644 --- a/src/gl/scene/gl_flats.cpp +++ b/src/gl/scene/gl_flats.cpp @@ -66,7 +66,7 @@ CVAR(Int, gl_breaksec, -1, 0) // information // //========================================================================== -static float tics; + void gl_SetPlaneTextureRotation(const GLSectorPlane * secplane, FMaterial * gltexture) { // only manipulate the texture matrix if needed. diff --git a/src/gl/scene/gl_portal.cpp b/src/gl/scene/gl_portal.cpp index 38ce80799..468ecefc2 100644 --- a/src/gl/scene/gl_portal.cpp +++ b/src/gl/scene/gl_portal.cpp @@ -310,8 +310,6 @@ inline void GLPortal::ClearClipper() drawer->clipper.Clear(); - static int call=0; - // Set the clipper to the minimal visible area drawer->clipper.SafeAddClipRange(0,0xffffffff); for (unsigned int i = 0; i < lines.Size(); i++) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 5af056e3e..8565bc42a 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -8869,7 +8869,6 @@ scriptwait: { static const char bar[] = TEXTCOLOR_ORANGE "\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36" "\36\36\36\36\36\36\36\36\36\36\36\36\37" TEXTCOLOR_NORMAL "\n"; - static const char logbar[] = "\n<------------------------------->\n"; char consolecolor[3]; consolecolor[0] = '\x1c'; diff --git a/src/zstrformat.cpp b/src/zstrformat.cpp index 65ed889ae..05b31e59a 100644 --- a/src/zstrformat.cpp +++ b/src/zstrformat.cpp @@ -113,7 +113,6 @@ static const char hexits[16] = {'0','1','2','3','4','5','6','7','8','9','a','b', static const char HEXits[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; static const char spaces[16] = {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '}; static const char zeroes[17] = {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','.'}; -static const char dotchar = '.'; namespace StringFormat {