From bf92ae06cae3f28cb4f1c71b6359f90dc7bfc66b Mon Sep 17 00:00:00 2001 From: sezero Date: Tue, 24 Aug 2010 09:20:19 +0000 Subject: [PATCH] screen.h (canvastype): Added CANVAS_INVALID as a new enumerated value (-1). gl_draw.c (GL_Set2D): Use CANVAS_INVALID instead of -1. git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@295 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/gl_draw.c | 2 +- quakespasm/Quake/screen.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/quakespasm/Quake/gl_draw.c b/quakespasm/Quake/gl_draw.c index c90a283e..e24ef62b 100644 --- a/quakespasm/Quake/gl_draw.c +++ b/quakespasm/Quake/gl_draw.c @@ -858,7 +858,7 @@ GL_Set2D -- johnfitz -- rewritten */ void GL_Set2D (void) { - currentcanvas = -1; + currentcanvas = CANVAS_INVALID; GL_SetCanvas (CANVAS_DEFAULT); glDisable (GL_DEPTH_TEST); diff --git a/quakespasm/Quake/screen.h b/quakespasm/Quake/screen.h index a75a2125..761382f0 100644 --- a/quakespasm/Quake/screen.h +++ b/quakespasm/Quake/screen.h @@ -69,6 +69,7 @@ typedef enum { CANVAS_BOTTOMLEFT, CANVAS_BOTTOMRIGHT, CANVAS_TOPRIGHT, + CANVAS_INVALID = -1 } canvastype; extern cvar_t scr_menuscale; extern cvar_t scr_sbarscale;