From eb8f1f714945446588b122f09de5f1959e2856ee Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 23 Nov 2004 01:11:54 +0000 Subject: [PATCH] certainly made that a bit cleaner. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@518 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/plugin.c | 69 ++++++++++++------------------------------ 1 file changed, 19 insertions(+), 50 deletions(-) diff --git a/engine/common/plugin.c b/engine/common/plugin.c index 254a1a5c4..46fc2c66a 100644 --- a/engine/common/plugin.c +++ b/engine/common/plugin.c @@ -453,23 +453,22 @@ int Plug_Draw_Image(void *offset, unsigned int mask, const long *arg) else pic = Draw_CachePic(pluginimagearray[i].name); +#ifdef RGLQUAKE switch (qrenderer) { -#ifdef RGLQUAKE case QR_OPENGL: glEnable(GL_BLEND); glDisable(GL_DEPTH_TEST); glDisable(GL_ALPHA_TEST); GLDraw_Image(VM_FLOAT(arg[0]), VM_FLOAT(arg[1]), VM_FLOAT(arg[2]), VM_FLOAT(arg[3]), VM_FLOAT(arg[4]), VM_FLOAT(arg[5]), VM_FLOAT(arg[6]), VM_FLOAT(arg[7]), pic); break; + } #endif -#ifdef SWQUAKE - case QR_SOFTWARE: - SWDraw_Image(VM_FLOAT(arg[0]), VM_FLOAT(arg[1]), VM_FLOAT(arg[2]), VM_FLOAT(arg[3]), VM_FLOAT(arg[4]), VM_FLOAT(arg[5]), VM_FLOAT(arg[6]), VM_FLOAT(arg[7]), pic); - break; -#endif - default: - break; + + if (Draw_Image) + { + Draw_Image(VM_FLOAT(arg[0]), VM_FLOAT(arg[1]), VM_FLOAT(arg[2]), VM_FLOAT(arg[3]), VM_FLOAT(arg[4]), VM_FLOAT(arg[5]), VM_FLOAT(arg[6]), VM_FLOAT(arg[7]), pic); + return 1; } return 1; @@ -514,61 +513,31 @@ int Plug_Draw_ColourP(void *offset, unsigned int mask, const long *arg) if (arg[0]<0 || arg[0]>255) return false; - switch(qrenderer) + if (Draw_ImageColours) { -#ifdef RGLQUAKE - case QR_OPENGL: - glColor3f(pal[0]/255.0f, pal[1]/255.0f, pal[2]/255.0f); - break; -#endif -#ifdef SWQUAKE - case QR_SOFTWARE: - SWDraw_ImageColours(pal[0]/255.0f, pal[1]/255.0f, pal[2]/255.0f, 1); - break; -#endif - default: - return 0; + Draw_ImageColours(pal[0]/255.0f, pal[1]/255.0f, pal[2]/255.0f, 1); + return 1; } - return 1; + return 0; } int Plug_Draw_Colour3f(void *offset, unsigned int mask, const long *arg) { - switch(qrenderer) + if (Draw_ImageColours) { -#ifdef RGLQUAKE - case QR_OPENGL: - glColor3f(VM_FLOAT(arg[0]), VM_FLOAT(arg[1]), VM_FLOAT(arg[2])); - break; -#endif -#ifdef SWQUAKE - case QR_SOFTWARE: - SWDraw_ImageColours(VM_FLOAT(arg[0]), VM_FLOAT(arg[1]), VM_FLOAT(arg[2]), 1); - break; -#endif - default: - return 0; + Draw_ImageColours(VM_FLOAT(arg[0]), VM_FLOAT(arg[1]), VM_FLOAT(arg[2]), 1); + return 1; } - return 1; + return 0; } int Plug_Draw_Colour4f(void *offset, unsigned int mask, const long *arg) { - switch(qrenderer) + if (Draw_ImageColours) { -#ifdef RGLQUAKE - case QR_OPENGL: - glColor4f(VM_FLOAT(arg[0]), VM_FLOAT(arg[1]), VM_FLOAT(arg[2]), VM_FLOAT(arg[3])); - break; -#endif -#ifdef SWQUAKE - case QR_SOFTWARE: - SWDraw_ImageColours(VM_FLOAT(arg[0]), VM_FLOAT(arg[1]), VM_FLOAT(arg[2]), VM_FLOAT(arg[3])); - break; -#endif - default: - return 0; + Draw_ImageColours(VM_FLOAT(arg[0]), VM_FLOAT(arg[1]), VM_FLOAT(arg[2]), VM_FLOAT(arg[3])); + return 1; } - return 1; + return 0; } int Plug_Key_GetKeyCode(void *offset, unsigned int mask, const long *arg)