From 17d0482938afc55dbb794f257971965b96404806 Mon Sep 17 00:00:00 2001 From: zicodxx Date: Wed, 2 Feb 2011 02:12:09 +0100 Subject: [PATCH] After rendering Reboot reticle, reset glLineWidth to default value again --- CHANGELOG.txt | 1 + arch/ogl/ogl.c | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 24dc1d427..2a510db1c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D1X-Rebirth Changelog 20110202 -------- arch/include/event.h, arch/include/joy.h, arch/include/key.h, arch/include/mouse.h, arch/sdl/event.c, arch/sdl/joy.c, arch/sdl/key.c, arch/sdl/mouse.c, main/automap.c, main/endlevel.c, main/game.c, main/gamecntl.c, main/inferno.c, main/kconfig.c, main/kconfig.h, main/multi.c, main/newmenu.c, main/slew.c: Added event types for all input actions; Rewrote kconfig code to work with events; static defined inputs will not trigger kconfig-mapped inputs anymore; Simplified keyboard, mouse and joystick code a lot due to event-based handling; Added function to toggle SDL key repeats on and off; Put timer_update() to event_process; Removed return when event_poll() is idle to get cursor hiding to work again; Added a small delay between cursoe hiding and re-enabling to cursor will not accidentially enable by SDL event centering cursor while hiding +arch/ogl/ogl.c: After rendering Reboot reticle, reset glLineWidth to default value again 20110126 -------- diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c index f9f407eca..bd44752cf 100644 --- a/arch/ogl/ogl.c +++ b/arch/ogl/ogl.c @@ -717,6 +717,7 @@ void ogl_draw_vertex_reticle(int cross,int primary,int secondary,int color,int a //glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_COLOR_ARRAY); glPopMatrix(); + glLineWidth(linedotscale); } /*