fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-10 20:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reduce duplicate code a little.

Browse source
This commit is contained in:
Shpoike 2020-09-02 11:51:44 +01:00
parent bec4f4c0c5
commit 4aee746efa
3 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Quake/common.h
View file

@ -47,6 +47,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
((x) < (_minval) ? (_minval) : \ ((x) < (_minval) ? (_minval) : \
(x) > (_maxval) ? (_maxval) : (x)) (x) > (_maxval) ? (_maxval) : (x))
#define countof(x) (sizeof(x)/sizeof((x)[0]))
typedef struct sizebuf_s typedef struct sizebuf_s
{ {
qboolean allowoverflow; // if false, do a Sys_Error qboolean allowoverflow; // if false, do a Sys_Error

2
Quake/gl_mesh.c
View file

@ -32,8 +32,6 @@ ALIAS MODEL DISPLAY LIST GENERATION
================================================================= =================================================================
*/ */
#define countof(x) (sizeof(x)/sizeof((x)[0]))
/* /*
================ ================
GL_MakeAliasModelDisplayLists GL_MakeAliasModelDisplayLists

41
Quake/pr_ext.c
View file

@ -27,7 +27,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.h" #include "quakedef.h"
#include "q_ctype.h" #include "q_ctype.h"
#define countof(x) (sizeof(x)/sizeof((x)[0])) static float PR_GetVMScale(void)
{ //sigh, this is horrible (divides glwidth)
float s;
if (qcvm == &cls.menu_qcvm)
{
s = q_min((float)glwidth / 320.0, (float)glheight / 200.0);
s = CLAMP (1.0, scr_menuscale.value, s);
}
else
s = CLAMP (1.0, scr_sbarscale.value, (float)glwidth / 320.0);
return s;
}
//there's a few different aproaches to tempstrings... //there's a few different aproaches to tempstrings...
//the lame way is to just have a single one (vanilla). //the lame way is to just have a single one (vanilla).
@ -4856,14 +4867,7 @@ static void PF_cl_stringwidth(void)
static void PF_cl_drawsetclip(void) static void PF_cl_drawsetclip(void)
{ {
float s; float s = PR_GetVMScale();
if (qcvm == &cls.menu_qcvm)
{
s = q_min((float)glwidth / 320.0, (float)glheight / 200.0);
s = CLAMP (1.0, scr_menuscale.value, s);
}
else
s = CLAMP (1.0, scr_sbarscale.value, (float)glwidth / 320.0);
float x = G_FLOAT(OFS_PARM0)*s; float x = G_FLOAT(OFS_PARM0)*s;
float y = G_FLOAT(OFS_PARM1)*s; float y = G_FLOAT(OFS_PARM1)*s;
@ -5430,15 +5434,7 @@ static void PF_m_getkeydest(void)
} }
static void PF_m_getmousepos(void) static void PF_m_getmousepos(void)
{ {
float s; float s = PR_GetVMScale();
if (qcvm == &cls.menu_qcvm)
{
s = q_min((float)glwidth / 320.0, (float)glheight / 200.0);
s = CLAMP (1.0, scr_menuscale.value, s);
}
else
s = CLAMP (1.0, scr_sbarscale.value, (float)glwidth / 320.0);
G_FLOAT(OFS_RETURN+0) = vid.cursorpos[0]/s; G_FLOAT(OFS_RETURN+0) = vid.cursorpos[0]/s;
G_FLOAT(OFS_RETURN+1) = vid.cursorpos[1]/s; G_FLOAT(OFS_RETURN+1) = vid.cursorpos[1]/s;
G_FLOAT(OFS_RETURN+2) = 0; G_FLOAT(OFS_RETURN+2) = 0;
@ -5947,14 +5943,7 @@ void R_RenderScene (void);
float CalcFovy (float fov_x, float width, float height); float CalcFovy (float fov_x, float width, float height);
static void PF_m_renderscene(void) static void PF_m_renderscene(void)
{ {
float s; float s = PR_GetVMScale();
if (qcvm == &cls.menu_qcvm)
{
s = q_min((float)glwidth / 320.0, (float)glheight / 200.0);
s = CLAMP (1.0, scr_menuscale.value, s);
}
else
s = CLAMP (1.0, scr_sbarscale.value, (float)glwidth / 320.0);
VectorCopy(viewprops.origin, r_refdef.vieworg); VectorCopy(viewprops.origin, r_refdef.vieworg);
VectorCopy(viewprops.angles, r_refdef.viewangles); VectorCopy(viewprops.angles, r_refdef.viewangles);