From c6a946100d59bfda7674d3772cf45bca21d2fca2 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 16 Oct 2025 13:40:03 +0200 Subject: [PATCH] delet duped stuff from merge conflict lel --- src/hardware/r_opengl/r_opengl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 82a527348..c6e3871a2 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -47,10 +47,6 @@ #include "../../console.h" #endif -#ifdef GLDEBUGMESSAGE -#include "../../console.h" -#endif - struct GLRGBAFloat { GLfloat red; @@ -1466,7 +1462,7 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale) // -----------------+ void GL_SetPalette(RGBA_t *palette) { - size_t palsize = (sizeof(RGBA_t) * 256); + const size_t palsize = (sizeof(RGBA_t) * 256); // on a palette change, you have to reload all of the textures if (memcmp(&myPaletteData, palette, palsize)) {