From c68ffec274e6dbb05a11bda7120bafb0a57671d5 Mon Sep 17 00:00:00 2001 From: Jaime Moreira Date: Tue, 4 Jun 2024 14:53:25 -0400 Subject: [PATCH] GL1 multitexture bugfix With "hand 2" and no "alias" models in player sight, sometimes only lightmap was visible. Now forcing disabled multitexture when needed. Another bugfix: "gl_showbbox 1" no longer produces OpenGL errors. --- src/client/refresh/gl1/gl1_main.c | 1 + src/client/refresh/gl1/gl1_mesh.c | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/client/refresh/gl1/gl1_main.c b/src/client/refresh/gl1/gl1_main.c index b9f21f39..309e8c2a 100644 --- a/src/client/refresh/gl1/gl1_main.c +++ b/src/client/refresh/gl1/gl1_main.c @@ -409,6 +409,7 @@ R_DrawEntitiesOnList(void) } glDepthMask(1); /* back to writing */ + R_EnableMultitexture(false); } void diff --git a/src/client/refresh/gl1/gl1_mesh.c b/src/client/refresh/gl1/gl1_mesh.c index 1c3f5d13..e4ab4f8c 100644 --- a/src/client/refresh/gl1/gl1_mesh.c +++ b/src/client/refresh/gl1/gl1_mesh.c @@ -825,14 +825,12 @@ R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel) glDisable(GL_CULL_FACE); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); glDisable(GL_TEXTURE_2D); - glBegin(GL_TRIANGLE_STRIP); - for (i = 0; i < 8; i++) - { - glVertex3fv(bbox[i]); - } + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(3, GL_FLOAT, 0, bbox); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 8); + glDisableClientState(GL_VERTEX_ARRAY); - glEnd(); glEnable(GL_TEXTURE_2D); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); glEnable(GL_CULL_FACE);