nzp-team
/
fteqw
mirror of https://github.com/nzp-team/fteqw.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FTE, now with added C support - no longer treating enums as regular ints. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3509 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2010-02-06 01:25:04 +00:00
parent 91d856d72e
commit 589ef03c05
37 changed files with 301 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
engine/client/cl_main.c
View File

@ -3617,7 +3617,7 @@ void Host_Init (quakeparms_t *parms)
Hunk_AllocName (0, "-HOST_HUNKLEVEL-"); Hunk_AllocName (0, "-HOST_HUNKLEVEL-");
host_hunklevel = Hunk_LowMark (); host_hunklevel = Hunk_LowMark ();
R_SetRenderer(-1);//set the renderer stuff to unset... R_SetRenderer(NULL);//set the renderer stuff to unset...
host_initialized = true; host_initialized = true;
@ -3696,24 +3696,7 @@ void Host_FinishInit(void)
Cmd_StuffCmds(); Cmd_StuffCmds();
Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to
Renderer_Start();
Cvar_ApplyLatches(CVAR_RENDERERLATCH);
//-1 means 'never set'
if (qrenderer == -1 && *vid_renderer.string)
{
Cmd_ExecuteString("vid_restart\n", RESTRICT_LOCAL);
}
if (qrenderer == -1)
{ //we still failed. Try again, but use the default renderer.
Cvar_Set(&vid_renderer, "");
Cmd_ExecuteString("vid_restart\n", RESTRICT_LOCAL);
}
if (qrenderer == -1)
Sys_Error("No renderer was set!\n");
if (qrenderer == QR_NONE)
Con_Printf("Use the setrenderer command to use a gui\n");
#ifdef VM_UI #ifdef VM_UI
UI_Init(); UI_Init();

30
engine/client/cl_plugin.inc
View File

@ -13,7 +13,7 @@ static plugin_t *protocolclientplugin;
qintptr_t VARGS Plug_Menu_Control(void *offset, quintptr_t mask, const qintptr_t *arg) qintptr_t VARGS Plug_Menu_Control(void *offset, quintptr_t mask, const qintptr_t *arg)
{ {
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return 0; return 0;
switch(VM_LONG(arg[0])) switch(VM_LONG(arg[0]))
@ -56,7 +56,7 @@ qintptr_t VARGS Plug_Key_GetKeyCode(void *offset, quintptr_t mask, const qintptr
qintptr_t VARGS Plug_SCR_CenterPrint(void *offset, quintptr_t mask, const qintptr_t *arg) qintptr_t VARGS Plug_SCR_CenterPrint(void *offset, quintptr_t mask, const qintptr_t *arg)
{ {
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return 0; return 0;
SCR_CenterPrint(0, VM_POINTER(arg[0]), true); SCR_CenterPrint(0, VM_POINTER(arg[0]), true);
@ -72,7 +72,7 @@ qintptr_t VARGS Plug_Media_ShowFrameRGBA_32(void *offset, quintptr_t mask, const
// int width = VM_LONG(arg[5]); // int width = VM_LONG(arg[5]);
// int height = VM_LONG(arg[6]); // int height = VM_LONG(arg[6]);
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return 0; return 0;
Media_ShowFrameRGBA_32(src, srcwidth, srcheight); Media_ShowFrameRGBA_32(src, srcwidth, srcheight);
@ -123,7 +123,7 @@ qintptr_t VARGS Plug_Draw_LoadImage(void *offset, quintptr_t mask, const qintptr
if (pluginimagearray[i].pic) if (pluginimagearray[i].pic)
return i+1; //already loaded. return i+1; //already loaded.
if (qrenderer > 0) if (qrenderer != QR_NONE)
{ {
if (fromwad && Draw_SafePicFromWad) if (fromwad && Draw_SafePicFromWad)
pic = Draw_SafePicFromWad(name); pic = Draw_SafePicFromWad(name);
@ -184,7 +184,7 @@ qintptr_t VARGS Plug_Draw_Image(void *offset, quintptr_t mask, const qintptr_t *
{ {
mpic_t *pic; mpic_t *pic;
int i; int i;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return 0; return 0;
if (!Draw_Image) if (!Draw_Image)
return 0; return 0;
@ -233,7 +233,7 @@ qintptr_t VARGS Plug_Draw_Line(void *offset, quintptr_t mask, const qintptr_t *a
qintptr_t VARGS Plug_Draw_Character(void *offset, quintptr_t mask, const qintptr_t *arg) qintptr_t VARGS Plug_Draw_Character(void *offset, quintptr_t mask, const qintptr_t *arg)
{ {
int x, y; int x, y;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return 0; return 0;
Font_BeginString(font_conchar, arg[0], arg[1], &x, &y); Font_BeginString(font_conchar, arg[0], arg[1], &x, &y);
Font_DrawChar(x, y, CON_WHITEMASK | 0xe000 | (unsigned int)arg[2]); Font_DrawChar(x, y, CON_WHITEMASK | 0xe000 | (unsigned int)arg[2]);
@ -244,7 +244,7 @@ void (D3D_Draw_Fill_Colours) (int x, int y, int w, int h);
qintptr_t VARGS Plug_Draw_Fill(void *offset, quintptr_t mask, const qintptr_t *arg) qintptr_t VARGS Plug_Draw_Fill(void *offset, quintptr_t mask, const qintptr_t *arg)
{ {
float x, y, width, height; float x, y, width, height;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return 0; return 0;
x = VM_FLOAT(arg[0]); x = VM_FLOAT(arg[0]);
y = VM_FLOAT(arg[1]); y = VM_FLOAT(arg[1]);
@ -315,7 +315,7 @@ qintptr_t VARGS Plug_Draw_Colour4f(void *offset, quintptr_t mask, const qintptr_
qintptr_t VARGS Plug_LocalSound(void *offset, quintptr_t mask, const qintptr_t *arg) qintptr_t VARGS Plug_LocalSound(void *offset, quintptr_t mask, const qintptr_t *arg)
{ {
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return false; return false;
S_LocalSound(VM_POINTER(arg[0])); S_LocalSound(VM_POINTER(arg[0]));
@ -335,7 +335,7 @@ qintptr_t VARGS Plug_CL_GetStats(void *offset, quintptr_t mask, const qintptr_t
if (VM_OOB(arg[1], arg[2]*4)) if (VM_OOB(arg[1], arg[2]*4))
return 0; return 0;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return false; return false;
max = pluginstats; max = pluginstats;
@ -457,7 +457,7 @@ qintptr_t VARGS Plug_Con_SubPrint(void *offset, quintptr_t mask, const qintptr_t
char *text = VM_POINTER(arg[1]); char *text = VM_POINTER(arg[1]);
console_t *con; console_t *con;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return false; return false;
con = Con_FindConsole(name); con = Con_FindConsole(name);
@ -481,7 +481,7 @@ qintptr_t VARGS Plug_Con_RenameSub(void *offset, quintptr_t mask, const qintptr_
{ {
char *name = VM_POINTER(arg[0]); char *name = VM_POINTER(arg[0]);
console_t *con; console_t *con;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return false; return false;
con = Con_FindConsole(name); con = Con_FindConsole(name);
if (!con) if (!con)
@ -495,7 +495,7 @@ qintptr_t VARGS Plug_Con_IsActive(void *offset, quintptr_t mask, const qintptr_t
{ {
char *name = VM_POINTER(arg[0]); char *name = VM_POINTER(arg[0]);
console_t *con; console_t *con;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return false; return false;
con = Con_FindConsole(name); con = Con_FindConsole(name);
if (!con) if (!con)
@ -507,7 +507,7 @@ qintptr_t VARGS Plug_Con_SetActive(void *offset, quintptr_t mask, const qintptr_
{ {
char *name = VM_POINTER(arg[0]); char *name = VM_POINTER(arg[0]);
console_t *con; console_t *con;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return false; return false;
con = Con_FindConsole(name); con = Con_FindConsole(name);
if (!con) if (!con)
@ -520,7 +520,7 @@ qintptr_t VARGS Plug_Con_Destroy(void *offset, quintptr_t mask, const qintptr_t
{ {
char *name = VM_POINTER(arg[0]); char *name = VM_POINTER(arg[0]);
console_t *con; console_t *con;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return false; return false;
con = Con_FindConsole(name); con = Con_FindConsole(name);
if (!con) if (!con)
@ -536,7 +536,7 @@ qintptr_t VARGS Plug_Con_NameForNum(void *offset, quintptr_t mask, const qintptr
int buffersize = VM_LONG(arg[2]); int buffersize = VM_LONG(arg[2]);
if (VM_OOB(arg[1], arg[2]) || buffersize < 1) if (VM_OOB(arg[1], arg[2]) || buffersize < 1)
return false; return false;
if (qrenderer <= 0) if (qrenderer == QR_NONE)
return false; return false;
return Con_NameForNum(num, buffer, buffersize); return Con_NameForNum(num, buffer, buffersize);

2
engine/client/keys.c
View File

@ -416,7 +416,7 @@ vec3_t sccolor;
void Con_Selectioncolour_Callback(struct cvar_s *var, char *oldvalue) void Con_Selectioncolour_Callback(struct cvar_s *var, char *oldvalue)
{ {
if (qrenderer != QR_NONE && qrenderer != -1) if (qrenderer != QR_NONE)
SCR_StringToRGB(var->string, sccolor, 1); SCR_StringToRGB(var->string, sccolor, 1);
} }

6
engine/client/m_items.c
View File

@ -689,7 +689,7 @@ menupicture_t *MC_AddSelectablePicture(menu_t *menu, int x, int y, char *picname
char selname[MAX_QPATH]; char selname[MAX_QPATH];
menupicture_t *n; menupicture_t *n;
if (!qrenderer) if (qrenderer == QR_NONE)
return NULL; return NULL;
Q_strncpyz(selname, picname, sizeof(selname)); Q_strncpyz(selname, picname, sizeof(selname));
@ -715,7 +715,7 @@ menupicture_t *MC_AddSelectablePicture(menu_t *menu, int x, int y, char *picname
menupicture_t *MC_AddPicture(menu_t *menu, int x, int y, int width, int height, char *picname) menupicture_t *MC_AddPicture(menu_t *menu, int x, int y, int width, int height, char *picname)
{ {
menupicture_t *n; menupicture_t *n;
if (!qrenderer) if (qrenderer == QR_NONE)
return NULL; return NULL;
Draw_SafeCachePic(picname); Draw_SafeCachePic(picname);
@ -741,7 +741,7 @@ menupicture_t *MC_AddCenterPicture(menu_t *menu, int y, int height, char *picnam
int width; int width;
mpic_t *p; mpic_t *p;
if (!qrenderer) if (qrenderer == QR_NONE)
return NULL; return NULL;
p = Draw_SafeCachePic(picname); p = Draw_SafeCachePic(picname);
if (!p) if (!p)

4
engine/client/merged.h
View File

@ -71,6 +71,8 @@ extern qboolean (*Draw_IsCached) (char *picname); //can be null
extern void (*Draw_Image) (float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic); //gl-style scaled/coloured/subpic extern void (*Draw_Image) (float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic); //gl-style scaled/coloured/subpic
extern void (*Draw_ImageColours) (float r, float g, float b, float a); extern void (*Draw_ImageColours) (float r, float g, float b, float a);
void R2D_FillBlock(int x, int y, int w, int h);
#define Draw_FillBlock R2D_FillBlock
extern void (*R_Init) (void); extern void (*R_Init) (void);
extern void (*R_DeInit) (void); extern void (*R_DeInit) (void);
@ -149,7 +151,7 @@ void Draw_FunStringWidth(int x, int y, const unsigned char *str, int width);
typedef struct { typedef struct rendererinfo_s {
char *description; char *description;
char *name[4]; char *name[4];
r_qrenderer_t rtype; r_qrenderer_t rtype;

2
engine/client/p_script.c
View File

@ -465,7 +465,7 @@ static void P_LoadTexture(part_type_t *ptype, qboolean warn)
texnums_t tn; texnums_t tn;
char *defaultshader; char *defaultshader;
char *namepostfix; char *namepostfix;
if (qrenderer<=0) if (qrenderer == QR_NONE)
return; return;
/*try and load the shader, fail if we would need to generate one*/ /*try and load the shader, fail if we would need to generate one*/

26
engine/client/pr_csqc.c
View File

@ -441,7 +441,7 @@ void skel_dodelete(void);
qboolean csqc_deprecated_warned; qboolean csqc_deprecated_warned;
#define csqc_deprecated(s) do {if (!csqc_deprecated_warned){Con_Printf("deprecated feature used: %s\n", s); csqc_deprecated_warned = true;}}while(0) #define csqc_deprecated(s) do {if (!csqc_deprecated_warned){Con_Printf("csqc warning: %s\n", s); csqc_deprecated_warned = true;}}while(0)
static model_t *CSQC_GetModelForIndex(int index); static model_t *CSQC_GetModelForIndex(int index);
@ -530,7 +530,7 @@ static void PF_cs_remove (progfuncs_t *prinst, struct globalvars_s *pr_globals)
if (ed->isfree) if (ed->isfree)
{ {
Con_DPrintf("CSQC Tried removing free entity\n"); csqc_deprecated("Tried removing free entity");
return; return;
} }
@ -548,12 +548,12 @@ static void PF_cvar (progfuncs_t *prinst, struct globalvars_s *pr_globals)
if (!strcmp(str, "vid_conwidth")) if (!strcmp(str, "vid_conwidth"))
{ {
csqc_deprecated("vid_conwidth cvar"); csqc_deprecated("vid_conwidth cvar used");
G_FLOAT(OFS_RETURN) = vid.width; G_FLOAT(OFS_RETURN) = vid.width;
} }
else if (!strcmp(str, "vid_conheight")) else if (!strcmp(str, "vid_conheight"))
{ {
csqc_deprecated("vid_conheight cvar"); csqc_deprecated("vid_conheight cvar used");
G_FLOAT(OFS_RETURN) = vid.height; G_FLOAT(OFS_RETURN) = vid.height;
} }
else else
@ -709,6 +709,10 @@ static qboolean CopyCSQCEdictToEntity(csqcedict_t *in, entity_t *out)
cs_getframestate(in, rflags, &out->framestate); cs_getframestate(in, rflags, &out->framestate);
VectorCopy(in->v->origin, out->origin); VectorCopy(in->v->origin, out->origin);
{
extern cvar_t temp1;
out->origin[2] += temp1.value;
}
if (rflags & CSQCRF_USEAXIS) if (rflags & CSQCRF_USEAXIS)
{ {
VectorCopy(csqcg.forward, out->axis[0]); VectorCopy(csqcg.forward, out->axis[0]);
@ -786,6 +790,11 @@ static void PF_R_AddEntity(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
csqcedict_t *in = (void*)G_EDICT(prinst, OFS_PARM0); csqcedict_t *in = (void*)G_EDICT(prinst, OFS_PARM0);
entity_t ent; entity_t ent;
if (in->isfree || in->entnum == 0)
{
csqc_deprecated("Tried drawing a free/removed/world entity\n");
return;
}
if (CopyCSQCEdictToEntity(in, &ent)) if (CopyCSQCEdictToEntity(in, &ent))
V_AddAxisEntity(&ent); V_AddAxisEntity(&ent);
@ -1413,7 +1422,7 @@ static void PF_cs_getstatf(progfuncs_t *prinst, struct globalvars_s *pr_globals)
float val = cl.statsf[csqc_lplayernum][stnum]; //copy float into the stat float val = cl.statsf[csqc_lplayernum][stnum]; //copy float into the stat
G_FLOAT(OFS_RETURN) = val; G_FLOAT(OFS_RETURN) = val;
} }
static void PF_cs_getstati(progfuncs_t *prinst, struct globalvars_s *pr_globals) static void PF_cs_getstatbits(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ //convert an int stat into a qc float. { //convert an int stat into a qc float.
int stnum = G_FLOAT(OFS_PARM0); int stnum = G_FLOAT(OFS_PARM0);
@ -4912,13 +4921,13 @@ static struct {
//330 //330
{"getstatf", PF_cs_getstatf, 330}, // #330 float(float stnum) getstatf (EXT_CSQC) {"getstatf", PF_cs_getstatf, 330}, // #330 float(float stnum) getstatf (EXT_CSQC)
{"getstati", PF_cs_getstati, 331}, // #331 float(float stnum) getstati (EXT_CSQC) {"getstatbits", PF_cs_getstatbits, 331}, // #331 float(float stnum) getstatbits (EXT_CSQC)
{"getstats", PF_cs_getstats, 332}, // #332 string(float firststnum) getstats (EXT_CSQC) {"getstats", PF_cs_getstats, 332}, // #332 string(float firststnum) getstats (EXT_CSQC)
{"setmodelindex", PF_cs_SetModelIndex, 333}, // #333 void(entity e, float mdlindex) setmodelindex (EXT_CSQC) {"setmodelindex", PF_cs_SetModelIndex, 333}, // #333 void(entity e, float mdlindex) setmodelindex (EXT_CSQC)
{"modelnameforindex", PF_cs_ModelnameForIndex, 334}, // #334 string(float mdlindex) modelnameforindex (EXT_CSQC) {"modelnameforindex", PF_cs_ModelnameForIndex, 334}, // #334 string(float mdlindex) modelnameforindex (EXT_CSQC)
{"particleeffectnum", PF_cs_particleeffectnum, 335}, // #335 float(string effectname) particleeffectnum (EXT_CSQC) {"particleeffectnum", PF_cs_particleeffectnum, 335}, // #335 float(string effectname) particleeffectnum (EXT_CSQC)
{"trailparticles", PF_cs_trailparticles, 336}, // #336 void(entity ent, float effectnum, vector start, vector end) trailparticles (EXT_CSQC), {"trailparticles", PF_cs_trailparticles, 336}, // #336 void(float effectnum, entity ent, vector start, vector end) trailparticles (EXT_CSQC),
{"pointparticles", PF_cs_pointparticles, 337}, // #337 void(float effectnum, vector origin [, vector dir, float count]) pointparticles (EXT_CSQC) {"pointparticles", PF_cs_pointparticles, 337}, // #337 void(float effectnum, vector origin [, vector dir, float count]) pointparticles (EXT_CSQC)
{"cprint", PF_cl_cprint, 338}, // #338 void(string s) cprint (EXT_CSQC) {"cprint", PF_cl_cprint, 338}, // #338 void(string s) cprint (EXT_CSQC)
@ -5399,7 +5408,7 @@ qboolean CSQC_Init (unsigned int checksum)
if (csqcprogs) if (csqcprogs)
return false; return false;
if (!qrenderer) if (qrenderer == QR_NONE)
{ {
return false; return false;
} }
@ -5415,6 +5424,7 @@ qboolean CSQC_Init (unsigned int checksum)
pr_builtin[BuiltinList[i].ebfsnum] = BuiltinList[i].bifunc; pr_builtin[BuiltinList[i].ebfsnum] = BuiltinList[i].bifunc;
} }
csqc_deprecated_warned = false;
skel_reset(); skel_reset();
memset(cl.model_csqcname, 0, sizeof(cl.model_csqcname)); memset(cl.model_csqcname, 0, sizeof(cl.model_csqcname));
memset(cl.model_csqcprecache, 0, sizeof(cl.model_csqcprecache)); memset(cl.model_csqcprecache, 0, sizeof(cl.model_csqcprecache));

21
engine/client/pr_menu.c
View File

@ -278,23 +278,10 @@ void PF_CL_drawfill (progfuncs_t *prinst, struct globalvars_s *pr_globals)
float *size = G_VECTOR(OFS_PARM1); float *size = G_VECTOR(OFS_PARM1);
float *rgb = G_VECTOR(OFS_PARM2); float *rgb = G_VECTOR(OFS_PARM2);
float alpha = G_FLOAT(OFS_PARM3); float alpha = G_FLOAT(OFS_PARM3);
#ifdef GLQUAKE
if (qrenderer == QR_OPENGL)
{
qglColor4f(rgb[0], rgb[1], rgb[2], alpha);
qglDisable(GL_TEXTURE_2D); Draw_ImageColours(rgb[0], rgb[1], rgb[2], alpha);
Draw_FillBlock(pos[0], pos[1], size[0], size[1]);
qglBegin(GL_QUADS);
qglVertex2f(pos[0], pos[1]);
qglVertex2f(pos[0]+size[0], pos[1]);
qglVertex2f(pos[0]+size[0], pos[1]+size[1]);
qglVertex2f(pos[0], pos[1]+size[1]);
qglEnd();
qglEnable(GL_TEXTURE_2D);
}
#endif
G_FLOAT(OFS_RETURN) = 1; G_FLOAT(OFS_RETURN) = 1;
} }
//void drawsetcliparea(float x, float y, float width, float height) = #458; //void drawsetcliparea(float x, float y, float width, float height) = #458;
@ -555,7 +542,7 @@ void PF_CL_drawrawstring (progfuncs_t *prinst, struct globalvars_s *pr_globals)
Font_ForceColour(rgb[0], rgb[1], rgb[2], alpha); Font_ForceColour(rgb[0], rgb[1], rgb[2], alpha);
while(*text) while(*text)
{ {
x = Font_DrawChar(x, y, 0xe000|(*text++&0xff)); x = Font_DrawChar(x, y, CON_WHITEMASK|0xe000|(*text++&0xff));
} }
Font_ForceColour(1, 1, 1, 1); Font_ForceColour(1, 1, 1, 1);
Font_EndString(font_conchar); Font_EndString(font_conchar);
@ -1788,7 +1775,7 @@ void VARGS Menu_Abort (char *format, ...)
double menutime; double menutime;
void MP_Init (void) void MP_Init (void)
{ {
if (!qrenderer) if (qrenderer == QR_NONE)
{ {
return; return;
} }

1
engine/client/quakedef.h
View File

@ -249,6 +249,7 @@ extern double realtime; // not bounded in any way, changed at
void Host_ServerFrame (void); void Host_ServerFrame (void);
void Host_InitCommands (void); void Host_InitCommands (void);
void Host_Init (quakeparms_t *parms); void Host_Init (quakeparms_t *parms);
void Host_FinishInit(void);
void Host_Shutdown(void); void Host_Shutdown(void);
NORETURN void VARGS Host_Error (char *error, ...) LIKEPRINTF(1); NORETURN void VARGS Host_Error (char *error, ...) LIKEPRINTF(1);
NORETURN void VARGS Host_EndGame (char *message, ...) LIKEPRINTF(1); NORETURN void VARGS Host_EndGame (char *message, ...) LIKEPRINTF(1);

49
engine/client/r_2d.c
View File

@ -6,6 +6,7 @@
texid_t missing_texture; texid_t missing_texture;
static mpic_t *conback; static mpic_t *conback;
static mpic_t *draw_backtile; static mpic_t *draw_backtile;
static mpic_t *draw_fill, *draw_fill_trans;
mpic_t *draw_disc; mpic_t *draw_disc;
static mesh_t draw_mesh; static mesh_t draw_mesh;
@ -82,6 +83,23 @@ void R2D_Init(void)
if (!draw_backtile) if (!draw_backtile)
draw_backtile = Draw_SafeCachePic ("gfx/menu/backtile.lmp"); draw_backtile = Draw_SafeCachePic ("gfx/menu/backtile.lmp");
draw_fill = R_RegisterShader("fill_opaque",
"{\n"
"{\n"
"map $whiteimage\n"
"rgbgen vertex\n"
"}\n"
"}\n");
draw_fill_trans = R_RegisterShader("fill_trans",
"{\n"
"{\n"
"map $whiteimage\n"
"rgbgen vertex\n"
"alphagen vertex\n"
"blendfunc blend\n"
"}\n"
"}\n");
Cvar_Hook(&gl_conback, R2D_Conback_Callback); Cvar_Hook(&gl_conback, R2D_Conback_Callback);
} }
@ -118,6 +136,16 @@ void R2D_ImageColours(float r, float g, float b, float a)
Vector4Copy(draw_mesh_colors[0], draw_mesh_colors[2]); Vector4Copy(draw_mesh_colors[0], draw_mesh_colors[2]);
Vector4Copy(draw_mesh_colors[0], draw_mesh_colors[3]); Vector4Copy(draw_mesh_colors[0], draw_mesh_colors[3]);
} }
void R2D_ImagePaletteColour(unsigned int i, float a)
{
draw_mesh_colors[0][0] = host_basepal[i*3+0]/255;
draw_mesh_colors[0][1] = host_basepal[i*3+1]/255;
draw_mesh_colors[0][2] = host_basepal[i*3+2]/255;
draw_mesh_colors[0][3] = a;
Vector4Copy(draw_mesh_colors[0], draw_mesh_colors[1]);
Vector4Copy(draw_mesh_colors[0], draw_mesh_colors[2]);
Vector4Copy(draw_mesh_colors[0], draw_mesh_colors[3]);
}
//awkward and weird to use //awkward and weird to use
void R2D_Image(float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic) void R2D_Image(float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic)
@ -154,6 +182,27 @@ void R2D_Image(float x, float y, float w, float h, float s1, float t1, float s2,
BE_DrawMeshChain(pic, &draw_mesh, NULL, &pic->defaulttextures); BE_DrawMeshChain(pic, &draw_mesh, NULL, &pic->defaulttextures);
} }
/*draws a block of the current colour on the screen*/
void R2D_FillBlock(int x, int y, int w, int h)
{
draw_mesh_xyz[0][0] = x;
draw_mesh_xyz[0][1] = y;
draw_mesh_xyz[1][0] = x+w;
draw_mesh_xyz[1][1] = y;
draw_mesh_xyz[2][0] = x+w;
draw_mesh_xyz[2][1] = y+h;
draw_mesh_xyz[3][0] = x;
draw_mesh_xyz[3][1] = y+h;
if (draw_mesh_colors[0][3] != 1)
BE_DrawMeshChain(draw_fill_trans, &draw_mesh, NULL, &draw_fill_trans->defaulttextures);
else
BE_DrawMeshChain(draw_fill, &draw_mesh, NULL, &draw_fill->defaulttextures);
}
void R2D_ScalePic (int x, int y, int width, int height, mpic_t *pic) void R2D_ScalePic (int x, int y, int width, int height, mpic_t *pic)
{ {
R2D_Image(x, y, width, height, 0, 0, 1, 1, pic); R2D_Image(x, y, width, height, 0, 0, 1, 1, pic);

4
engine/client/render.h
View File

@ -396,7 +396,7 @@ qbyte *R_CalcVis_Q1 (void);
qbyte *R_MarkLeaves_Q2 (void); qbyte *R_MarkLeaves_Q2 (void);
qbyte *R_MarkLeaves_Q3 (void); qbyte *R_MarkLeaves_Q3 (void);
void R_SetFrustum (float projmat[16], float viewmat[16]); void R_SetFrustum (float projmat[16], float viewmat[16]);
void R_SetRenderer(int wanted); void R_SetRenderer(rendererinfo_t *ri);
void R_AnimateLight (void); void R_AnimateLight (void);
struct texture_s *R_TextureAnimation (struct texture_s *base); struct texture_s *R_TextureAnimation (struct texture_s *base);
void RQ_Init(void); void RQ_Init(void);
@ -427,6 +427,8 @@ void SaturateR8G8B8(qbyte *data, int size, float sat);
void AddOcranaLEDsIndexed (qbyte *image, int h, int w); void AddOcranaLEDsIndexed (qbyte *image, int h, int w);
void Renderer_Init(void); void Renderer_Init(void);
void Renderer_Start(void);
qboolean Renderer_Started(void);
void R_ShutdownRenderer(void); void R_ShutdownRenderer(void);
void R_RestartRenderer_f (void);//this goes here so we can save some stack when first initing the sw renderer. void R_RestartRenderer_f (void);//this goes here so we can save some stack when first initing the sw renderer.

73
engine/client/renderer.c
View File

@ -526,10 +526,8 @@ void R_SetRenderer_f (void);
void Renderer_Init(void) void Renderer_Init(void)
{ {
currentrendererstate.bpp = -1; //no previous. currentrendererstate.renderer = NULL;
qrenderer = QR_NONE;
currentrendererstate.renderer = -1;
qrenderer = -1;
Cmd_AddCommand("setrenderer", R_SetRenderer_f); Cmd_AddCommand("setrenderer", R_SetRenderer_f);
Cmd_AddCommand("vid_restart", R_RestartRenderer_f); Cmd_AddCommand("vid_restart", R_RestartRenderer_f);
@ -671,6 +669,33 @@ void Renderer_Init(void)
RQ_Init(); RQ_Init();
} }
qboolean Renderer_Started(void)
{
return !!currentrendererstate.renderer;
}
void Renderer_Start(void)
{
Cvar_ApplyLatches(CVAR_RENDERERLATCH);
//renderer = none && currentrendererstate.bpp == -1 means we've never applied any mode at all
//if we currently have none, we do actually need to apply it still
if (qrenderer == QR_NONE && *vid_renderer.string)
{
Cmd_ExecuteString("vid_restart\n", RESTRICT_LOCAL);
}
if (!currentrendererstate.renderer)
{ //we still failed. Try again, but use the default renderer.
Cvar_Set(&vid_renderer, "");
Cmd_ExecuteString("vid_restart\n", RESTRICT_LOCAL);
}
if (!currentrendererstate.renderer)
Sys_Error("No renderer was set!\n");
if (qrenderer == QR_NONE)
Con_Printf("Use the setrenderer command to use a gui\n");
}
mpic_t *(*Draw_SafePicFromWad) (char *name); mpic_t *(*Draw_SafePicFromWad) (char *name);
mpic_t *(*Draw_SafeCachePic) (char *path); mpic_t *(*Draw_SafeCachePic) (char *path);
@ -692,7 +717,7 @@ void (*Draw_FadeScreen) (void);
void (*Draw_BeginDisc) (void); void (*Draw_BeginDisc) (void);
void (*Draw_EndDisc) (void); void (*Draw_EndDisc) (void);
void (*Draw_Image) (float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic); //gl-style scaled/coloured/subpic void (*Draw_Image) (float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic); //gl-style scaled/coloured/subpic
void (*Draw_ImageColours) (float r, float g, float b, float a); void (*Draw_ImageColours) (float r, float g, float b, float a);
void (*R_Init) (void); void (*R_Init) (void);
@ -750,7 +775,7 @@ char *q_renderername = "Non-Selected renderer";
rendererinfo_t dedicatedrendererinfo = { rendererinfo_t dedicatedrendererinfo = {
//ALL builds need a 'none' renderer, as 0. //ALL builds need a 'none' renderer, as 0.
"Dedicated server", "No renderer",
{ {
"none", "none",
"dedicated", "dedicated",
@ -1210,23 +1235,15 @@ void M_Menu_Video_f (void)
menu->event = CheckCustomMode; menu->event = CheckCustomMode;
} }
void R_SetRenderer(int wanted) void R_SetRenderer(rendererinfo_t *ri)
{ {
rendererinfo_t *ri; currentrendererstate.renderer = ri;
if (!ri)
if (wanted<0) ri = &dedicatedrendererinfo;
{ //-1 is used so we know when we've applied something instead of never setting anything.
wanted=0;
qrenderer = -1;
}
else
qrenderer = rendererinfo[wanted]->rtype;
ri = rendererinfo[wanted];
qrenderer = ri->rtype;
q_renderername = ri->name[0]; q_renderername = ri->name[0];
Draw_SafePicFromWad = ri->Draw_SafePicFromWad; //Not supported Draw_SafePicFromWad = ri->Draw_SafePicFromWad; //Not supported
Draw_SafeCachePic = ri->Draw_SafeCachePic; Draw_SafeCachePic = ri->Draw_SafeCachePic;
Draw_Init = ri->Draw_Init; Draw_Init = ri->Draw_Init;
@ -1348,12 +1365,14 @@ qboolean R_ApplyRenderer (rendererstate_t *newr)
{ {
if (newr->bpp == -1) if (newr->bpp == -1)
return false; return false;
if (!newr->renderer)
return false;
R_ShutdownRenderer(); R_ShutdownRenderer();
if (qrenderer == QR_NONE || qrenderer==-1) if (qrenderer == QR_NONE)
{ {
if (newr->renderer == QR_NONE && qrenderer != -1) if (newr->renderer->rtype == qrenderer)
return true; //no point return true; //no point
Sys_CloseTerminal (); Sys_CloseTerminal ();
@ -1377,7 +1396,7 @@ qboolean R_ApplyRenderer_Load (rendererstate_t *newr)
pmove.numphysent = 0; pmove.numphysent = 0;
if (qrenderer) //graphics stuff only when not dedicated if (qrenderer != QR_NONE) //graphics stuff only when not dedicated
{ {
qbyte *data; qbyte *data;
#ifndef CLIENTONLY #ifndef CLIENTONLY
@ -1755,7 +1774,7 @@ TRACE(("dbg: R_RestartRenderer_f\n"));
Q_strncpyz(newr.glrenderer, gl_driver.string, sizeof(newr.glrenderer)); Q_strncpyz(newr.glrenderer, gl_driver.string, sizeof(newr.glrenderer));
newr.renderer = -1; newr.renderer = NULL;
for (i = 0; i < sizeof(rendererinfo)/sizeof(rendererinfo[0]); i++) for (i = 0; i < sizeof(rendererinfo)/sizeof(rendererinfo[0]); i++)
{ {
if (!rendererinfo[i]->description) if (!rendererinfo[i]->description)
@ -1766,12 +1785,12 @@ TRACE(("dbg: R_RestartRenderer_f\n"));
continue; continue;
if (!stricmp(rendererinfo[i]->name[j], vid_renderer.string)) if (!stricmp(rendererinfo[i]->name[j], vid_renderer.string))
{ {
newr.renderer = i; newr.renderer = rendererinfo[i];
break; break;
} }
} }
} }
if (newr.renderer == -1) if (!newr.renderer)
{ {
Con_Printf("vid_renderer unset or invalid. Using default.\n"); Con_Printf("vid_renderer unset or invalid. Using default.\n");
//gotta do this after main hunk is saved off. //gotta do this after main hunk is saved off.
@ -1784,7 +1803,7 @@ TRACE(("dbg: R_RestartRenderer_f\n"));
} }
// use desktop settings if set to 0 and not dedicated // use desktop settings if set to 0 and not dedicated
if (newr.renderer != QR_NONE) if (newr.renderer->rtype != QR_NONE)
{ {
int dbpp, dheight, dwidth, drate; int dbpp, dheight, dwidth, drate;
@ -1849,7 +1868,7 @@ TRACE(("dbg: R_RestartRenderer_f\n"));
if (failed) if (failed)
{ {
newr.renderer = QR_NONE; newr.renderer = &dedicatedrendererinfo;
if (R_ApplyRenderer(&newr)) if (R_ApplyRenderer(&newr))
{ {
TRACE(("dbg: R_RestartRenderer_f going to dedicated\n")); TRACE(("dbg: R_RestartRenderer_f going to dedicated\n"));

2
engine/client/screen.h
View File

@ -105,7 +105,7 @@ void Font_BeginString(struct font_s *font, int vx, int vy, int *px, int *py);
int Font_CharHeight(void); int Font_CharHeight(void);
int Font_CharWidth(unsigned int charcode); int Font_CharWidth(unsigned int charcode);
int Font_DrawChar(int px, int py, unsigned int charcode); int Font_DrawChar(int px, int py, unsigned int charcode);
void Font_ForceColour(float r, float g, float b, float a); void Font_ForceColour(float r, float g, float b, float a); //This colour will be applied while the char mask remains WHITE. If you print char by char, make sure to include the mask.
void Font_EndString(struct font_s *font); void Font_EndString(struct font_s *font);
int Font_LineBreaks(conchar_t *start, conchar_t *end, int maxpixelwidth, int maxlines, conchar_t **starts, conchar_t **ends); int Font_LineBreaks(conchar_t *start, conchar_t *end, int maxpixelwidth, int maxlines, conchar_t **starts, conchar_t **ends);
extern struct font_s *font_conchar; extern struct font_s *font_conchar;

2
engine/client/textedit.c
View File

@ -985,7 +985,7 @@ int QCLibEditor(progfuncs_t *prfncs, char *filename, int line, int nump, char **
if (editormodal || !developer.ival) if (editormodal || !developer.ival)
return line; //whoops return line; //whoops
if (!qrenderer) if (qrenderer == QR_NONE)
{ {
int i; int i;
char buffer[8192]; char buffer[8192];

2
engine/client/vid.h
View File

@ -36,7 +36,7 @@ typedef struct {
int rate; int rate;
int multisample; //for opengl antialiasing (which requires context stuff) int multisample; //for opengl antialiasing (which requires context stuff)
char glrenderer[MAX_QPATH]; char glrenderer[MAX_QPATH];
r_qrenderer_t renderer; struct rendererinfo_s *renderer;
} rendererstate_t; } rendererstate_t;
typedef struct vrect_s typedef struct vrect_s

4
engine/client/zqtp.c
View File

@ -1939,7 +1939,7 @@ static void TP_TeamColor_f (void)
cl_teamtopcolor = top; cl_teamtopcolor = top;
cl_teambottomcolor = bottom; cl_teambottomcolor = bottom;
if (qrenderer>QR_NONE) //make sure we have the renderer initialised... if (qrenderer != QR_NONE) //make sure we have the renderer initialised...
for (i = 0; i < MAX_CLIENTS; i++) for (i = 0; i < MAX_CLIENTS; i++)
CL_NewTranslation(i); CL_NewTranslation(i);
} }
@ -1980,7 +1980,7 @@ static void TP_EnemyColor_f (void)
cl_enemytopcolor = top; cl_enemytopcolor = top;
cl_enemybottomcolor = bottom; cl_enemybottomcolor = bottom;
if (qrenderer>QR_NONE) //make sure we have the renderer initialised... if (qrenderer != QR_NONE) //make sure we have the renderer initialised...
for (i = 0; i < MAX_CLIENTS; i++) for (i = 0; i < MAX_CLIENTS; i++)
CL_NewTranslation(i); CL_NewTranslation(i);
} }

2
engine/common/com_mesh.c
View File

@ -3343,7 +3343,7 @@ qboolean Mod_LoadQ3Model(model_t *mod, void *buffer)
Q_strncpyz(skin->name, shadname, sizeof(skin->name)); Q_strncpyz(skin->name, shadname, sizeof(skin->name));
} }
if (qrenderer) if (qrenderer != QR_NONE)
{ {
texnum->shader = R_RegisterSkin(shadname); texnum->shader = R_RegisterSkin(shadname);
R_BuildDefaultTexnums(texnum, texnum->shader); R_BuildDefaultTexnums(texnum, texnum->shader);

2
engine/common/cvar.c
View File

@ -605,7 +605,7 @@ cvar_t *Cvar_SetCore (cvar_t *var, const char *value, qboolean force)
latch = "variable %s is latched and will be applied for the start of the next map\n"; latch = "variable %s is latched and will be applied for the start of the next map\n";
// else if (var->flags & CVAR_LATCHFLUSH) // else if (var->flags & CVAR_LATCHFLUSH)
// latch = "variable %s is latched (type flush)\n"; // latch = "variable %s is latched (type flush)\n";
else if (var->flags & CVAR_RENDERERLATCH && qrenderer) else if (var->flags & CVAR_RENDERERLATCH && qrenderer != QR_NONE)
latch = "variable %s will be changed after a vid_restart\n"; latch = "variable %s will be changed after a vid_restart\n";
else if (var->flags & CVAR_RULESETLATCH) else if (var->flags & CVAR_RULESETLATCH)
latch = "variable %s is latched due to current ruleset\n"; latch = "variable %s is latched due to current ruleset\n";

6
engine/common/fs.c
View File

@ -1215,7 +1215,7 @@ qbyte *COM_LoadFile (const char *path, int usehunk)
((qbyte *)buf)[len] = 0; ((qbyte *)buf)[len] = 0;
#ifndef SERVERONLY #ifndef SERVERONLY
if (qrenderer) if (qrenderer != QR_NONE)
if (Draw_BeginDisc) if (Draw_BeginDisc)
Draw_BeginDisc (); Draw_BeginDisc ();
#endif #endif
@ -1224,7 +1224,7 @@ qbyte *COM_LoadFile (const char *path, int usehunk)
VFS_CLOSE(f); VFS_CLOSE(f);
#ifndef SERVERONLY #ifndef SERVERONLY
if (qrenderer) if (qrenderer != QR_NONE)
if (Draw_EndDisc) if (Draw_EndDisc)
Draw_EndDisc (); Draw_EndDisc ();
#endif #endif
@ -1755,7 +1755,7 @@ void COM_Gamedir (const char *dir)
#ifndef SERVERONLY #ifndef SERVERONLY
if (!isDedicated) if (!isDedicated)
{ {
// if (qrenderer>0) //only do this if we have already started the renderer // if (qrenderer != QR_NONE) //only do this if we have already started the renderer
// Cbuf_InsertText("vid_restart\n", RESTRICT_LOCAL); // Cbuf_InsertText("vid_restart\n", RESTRICT_LOCAL);

2
engine/common/plugin.c
View File

@ -356,7 +356,7 @@ int Plug_Emumerated (const char *name, int size, void *param)
qintptr_t VARGS Plug_Con_Print(void *offset, quintptr_t mask, const qintptr_t *arg) qintptr_t VARGS Plug_Con_Print(void *offset, quintptr_t mask, const qintptr_t *arg)
{ {
// if (qrenderer <= 0) // if (qrenderer == QR_NONE)
// return false; // return false;
Con_Printf("%s", (char*)VM_POINTER(arg[0])); Con_Printf("%s", (char*)VM_POINTER(arg[0]));
return 0; return 0;

6
engine/common/sys.h
View File

@ -108,6 +108,12 @@ qboolean Sys_ConditionBroadcast(void *condv);
void Sys_DestroyConditional(void *condv); void Sys_DestroyConditional(void *condv);
#endif #endif
#ifdef NPQTV
qboolean NPQTV_Sys_Startup(int argc, char *argv[]);
void NPQTV_Sys_MainLoop(void);
void NPQTV_Sys_Shutdown(void);
#endif
#ifdef _WIN32 #ifdef _WIN32
int StartLocalServer(int close); int StartLocalServer(int close);
#endif #endif

47
engine/gl/gl_backend.c
View File

@ -1,4 +1,9 @@
#include "quakedef.h" #include "quakedef.h"
#define STATEFIXME
#define FORCESTATE
#ifdef GLQUAKE #ifdef GLQUAKE
#include "glquake.h" #include "glquake.h"
@ -426,7 +431,9 @@ struct {
void GL_TexEnv(GLenum mode) void GL_TexEnv(GLenum mode)
{ {
#ifndef FORCESTATE
if (mode != shaderstate.texenvmode[shaderstate.currenttmu]) if (mode != shaderstate.texenvmode[shaderstate.currenttmu])
#endif
{ {
qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode); qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
shaderstate.texenvmode[shaderstate.currenttmu] = mode; shaderstate.texenvmode[shaderstate.currenttmu] = mode;
@ -461,7 +468,9 @@ void GL_SelectTexture(int target)
void GL_SelectVBO(int vbo) void GL_SelectVBO(int vbo)
{ {
#ifndef FORCESTATE
if (shaderstate.currentvbo != vbo) if (shaderstate.currentvbo != vbo)
#endif
{ {
shaderstate.currentvbo = vbo; shaderstate.currentvbo = vbo;
qglBindBufferARB(GL_ARRAY_BUFFER_ARB, shaderstate.currentvbo); qglBindBufferARB(GL_ARRAY_BUFFER_ARB, shaderstate.currentvbo);
@ -469,7 +478,9 @@ void GL_SelectVBO(int vbo)
} }
void GL_SelectEBO(int vbo) void GL_SelectEBO(int vbo)
{ {
#ifndef FORCESTATE
if (shaderstate.currentebo != vbo) if (shaderstate.currentebo != vbo)
#endif
{ {
shaderstate.currentebo = vbo; shaderstate.currentebo = vbo;
qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, shaderstate.currentebo); qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, shaderstate.currentebo);
@ -478,7 +489,9 @@ void GL_SelectEBO(int vbo)
static void GL_ApplyVertexPointer(void) static void GL_ApplyVertexPointer(void)
{ {
#ifndef FORCESTATE
if (shaderstate.curvertexpointer != shaderstate.pendingvertexpointer || shaderstate.pendingvertexvbo != shaderstate.curvertexvbo) if (shaderstate.curvertexpointer != shaderstate.pendingvertexpointer || shaderstate.pendingvertexvbo != shaderstate.curvertexvbo)
#endif
{ {
shaderstate.curvertexpointer = shaderstate.pendingvertexpointer; shaderstate.curvertexpointer = shaderstate.pendingvertexpointer;
shaderstate.curvertexvbo = shaderstate.pendingvertexvbo; shaderstate.curvertexvbo = shaderstate.pendingvertexvbo;
@ -491,8 +504,10 @@ void GL_MBind(int target, texid_t texnum)
{ {
GL_SelectTexture(target); GL_SelectTexture(target);
#ifndef FORCESTATE
if (shaderstate.currenttextures[shaderstate.currenttmu] == texnum.num) if (shaderstate.currenttextures[shaderstate.currenttmu] == texnum.num)
return; return;
#endif
shaderstate.currenttextures[shaderstate.currenttmu] = texnum.num; shaderstate.currenttextures[shaderstate.currenttmu] = texnum.num;
bindTexFunc (GL_TEXTURE_2D, texnum.num); bindTexFunc (GL_TEXTURE_2D, texnum.num);
@ -500,8 +515,10 @@ void GL_MBind(int target, texid_t texnum)
void GL_Bind(texid_t texnum) void GL_Bind(texid_t texnum)
{ {
#ifndef FORCESTATE
if (shaderstate.currenttextures[shaderstate.currenttmu] == texnum.num) if (shaderstate.currenttextures[shaderstate.currenttmu] == texnum.num)
return; return;
#endif
shaderstate.currenttextures[shaderstate.currenttmu] = texnum.num; shaderstate.currenttextures[shaderstate.currenttmu] = texnum.num;
@ -510,8 +527,10 @@ void GL_Bind(texid_t texnum)
void GL_BindType(int type, texid_t texnum) void GL_BindType(int type, texid_t texnum)
{ {
#ifndef FORCESTATE
if (shaderstate.currenttextures[shaderstate.currenttmu] == texnum.num) if (shaderstate.currenttextures[shaderstate.currenttmu] == texnum.num)
return; return;
#endif
shaderstate.currenttextures[shaderstate.currenttmu] = texnum.num; shaderstate.currenttextures[shaderstate.currenttmu] = texnum.num;
bindTexFunc (type, texnum.num); bindTexFunc (type, texnum.num);
@ -519,8 +538,10 @@ void GL_BindType(int type, texid_t texnum)
void GL_CullFace(unsigned int sflags) void GL_CullFace(unsigned int sflags)
{ {
#ifndef FORCESTATE
if (shaderstate.curcull == sflags) if (shaderstate.curcull == sflags)
return; return;
#endif
shaderstate.curcull = sflags; shaderstate.curcull = sflags;
if (shaderstate.curcull & SHADER_CULL_FRONT) if (shaderstate.curcull & SHADER_CULL_FRONT)
@ -1567,8 +1588,6 @@ static void alphagen(const shaderpass_t *pass, int cnt, const avec4_t *src, avec
} }
} }
#define DVBOMETHOD 1
static void GenerateColourMods(const shaderpass_t *pass, const mesh_t *meshlist) static void GenerateColourMods(const shaderpass_t *pass, const mesh_t *meshlist)
{ {
if (meshlist->colors4b_array) if (meshlist->colors4b_array)
@ -1686,8 +1705,13 @@ static void BE_SendPassBlendAndDepth(unsigned int sbits)
delta = sbits^shaderstate.shaderbits; delta = sbits^shaderstate.shaderbits;
#pragma message("Hack to work around the fact that other bits of code change this state") #ifdef STATEFIXME
#pragma message("Hack to work around the fact that other bits of code change this state")
delta |= SBITS_MISC_NODEPTHTEST|SBITS_MISC_DEPTHEQUALONLY; delta |= SBITS_MISC_NODEPTHTEST|SBITS_MISC_DEPTHEQUALONLY;
#endif
#ifdef FORCESTATE
delta |= ~0;
#endif
if (!delta) if (!delta)
return; return;
shaderstate.shaderbits = sbits; shaderstate.shaderbits = sbits;
@ -2165,7 +2189,9 @@ static void DrawMeshChain(const mesh_t *meshlist)
shaderstate.pendingvertexvbo = shaderstate.sourcevbo->vbocoord; shaderstate.pendingvertexvbo = shaderstate.sourcevbo->vbocoord;
} }
#ifndef FORCESTATE
if (shaderstate.curcull != (shaderstate.curshader->flags & (SHADER_CULL_FRONT|SHADER_CULL_BACK))) if (shaderstate.curcull != (shaderstate.curshader->flags & (SHADER_CULL_FRONT|SHADER_CULL_BACK)))
#endif
{ {
shaderstate.curcull = (shaderstate.curshader->flags & (SHADER_CULL_FRONT|SHADER_CULL_BACK)); shaderstate.curcull = (shaderstate.curshader->flags & (SHADER_CULL_FRONT|SHADER_CULL_BACK));
@ -2185,7 +2211,7 @@ static void DrawMeshChain(const mesh_t *meshlist)
} }
} }
if (shaderstate.curentity != &r_worldentity) if (shaderstate.flags & BEF_PUSHDEPTH)
{ {
/*some quake doors etc are flush with the walls that they're meant to be hidden behind, or plats the same height as the floor, etc /*some quake doors etc are flush with the walls that they're meant to be hidden behind, or plats the same height as the floor, etc
we move them back very slightly using polygonoffset to avoid really ugly z-fighting*/ we move them back very slightly using polygonoffset to avoid really ugly z-fighting*/
@ -2194,7 +2220,9 @@ static void DrawMeshChain(const mesh_t *meshlist)
po.factor = shaderstate.curshader->polyoffset.factor + r_polygonoffset_submodel_factor.value; po.factor = shaderstate.curshader->polyoffset.factor + r_polygonoffset_submodel_factor.value;
po.unit = shaderstate.curshader->polyoffset.unit + r_polygonoffset_submodel_offset.value; po.unit = shaderstate.curshader->polyoffset.unit + r_polygonoffset_submodel_offset.value;
#ifndef FORCESTATE
if (((int*)&shaderstate.curpolyoffset)[0] != ((int*)&po)[0] || ((int*)&shaderstate.curpolyoffset)[1] != ((int*)&po)[1]) if (((int*)&shaderstate.curpolyoffset)[0] != ((int*)&po)[0] || ((int*)&shaderstate.curpolyoffset)[1] != ((int*)&po)[1])
#endif
{ {
shaderstate.curpolyoffset = po; shaderstate.curpolyoffset = po;
if (shaderstate.curpolyoffset.factor || shaderstate.curpolyoffset.unit) if (shaderstate.curpolyoffset.factor || shaderstate.curpolyoffset.unit)
@ -2208,7 +2236,9 @@ static void DrawMeshChain(const mesh_t *meshlist)
} }
else else
{ {
#ifndef FORCESTATE
if (*(int*)&shaderstate.curpolyoffset != *(int*)&shaderstate.curshader->polyoffset || *(int*)&shaderstate.curpolyoffset != *(int*)&shaderstate.curshader->polyoffset) if (*(int*)&shaderstate.curpolyoffset != *(int*)&shaderstate.curshader->polyoffset || *(int*)&shaderstate.curpolyoffset != *(int*)&shaderstate.curshader->polyoffset)
#endif
{ {
shaderstate.curpolyoffset = shaderstate.curshader->polyoffset; shaderstate.curpolyoffset = shaderstate.curshader->polyoffset;
if (shaderstate.curpolyoffset.factor || shaderstate.curpolyoffset.unit) if (shaderstate.curpolyoffset.factor || shaderstate.curpolyoffset.unit)
@ -2587,6 +2617,7 @@ void BE_BaseEntTextures(void)
{ {
extern model_t *currentmodel; extern model_t *currentmodel;
int i; int i;
unsigned int bef;
if (!r_drawentities.ival) if (!r_drawentities.ival)
return; return;
@ -2604,6 +2635,14 @@ void BE_BaseEntTextures(void)
switch(currententity->model->type) switch(currententity->model->type)
{ {
case mod_brush: case mod_brush:
bef = BEF_PUSHDEPTH;
if (currententity->flags & Q2RF_ADDITIVE)
bef |= BEF_FORCEADDITIVE;
else if (currententity->shaderRGBAf[3] < 1)
bef |= BEF_FORCETRANSPARENT;
if (currententity->flags & RF_NODEPTHTEST)
bef |= BEF_FORCENODEPTH;
BE_SelectMode(shaderstate.mode, bef);
BaseBrushTextures(currententity); BaseBrushTextures(currententity);
break; break;
case mod_alias: case mod_alias:

106
engine/gl/gl_draw.c
View File

@ -149,7 +149,9 @@ extern cvar_t scr_conalpha;
texid_t translate_texture; texid_t translate_texture;
texid_t missing_texture; //texture used when one is missing. texid_t missing_texture; //texture used when one is missing.
texid_t cs_texture; // crosshair texture texid_t cs_texture; // crosshair texture
shader_t *crosshair_shader;
float custom_char_instep, default_char_instep; //to avoid blending issues float custom_char_instep, default_char_instep; //to avoid blending issues
float char_instep; float char_instep;
@ -387,6 +389,15 @@ TRACE(("dbg: GLDraw_ReInit: Allocating upload buffers\n"));
cs_texture = GL_AllocNewTexture(); cs_texture = GL_AllocNewTexture();
crosshair_shader = R_RegisterShader("crosshairshader",
"{\n"
"{\n"
"map $diffuse\n"
"blendfunc blend\n"
"}\n"
"}\n"
);
missing_texture = GL_LoadTexture("no_texture", 16, 16, (unsigned char*)r_notexture_mip + r_notexture_mip->offsets[0], IF_NOALPHA|IF_NOGAMMA, 0); missing_texture = GL_LoadTexture("no_texture", 16, 16, (unsigned char*)r_notexture_mip + r_notexture_mip->offsets[0], IF_NOALPHA|IF_NOGAMMA, 0);
GL_SetupSceneProcessingTextures(); GL_SetupSceneProcessingTextures();
@ -485,6 +496,17 @@ void GLCrosshair_Callback(struct cvar_s *var, char *oldvalue)
#undef Pix #undef Pix
R_Upload(cs_texture, NULL, TF_RGBA32, cs_data, 16, 16, IF_NOMIPMAP|IF_NOGAMMA); R_Upload(cs_texture, NULL, TF_RGBA32, cs_data, 16, 16, IF_NOMIPMAP|IF_NOGAMMA);
if (gl_smoothcrosshair.ival)
{
qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
else
{
qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
}
} }
void GLCrosshaircolor_Callback(struct cvar_s *var, char *oldvalue) void GLCrosshaircolor_Callback(struct cvar_s *var, char *oldvalue)
@ -502,9 +524,10 @@ void GLDraw_Crosshair(void)
{ {
int x, y; int x, y;
int sc; int sc;
float sx, sy, sizex, sizey;
float x1, x2, y1, y2;
float size, chc; float size, chc;
shader_t *shader;
qboolean usingimage = false; qboolean usingimage = false;
@ -514,89 +537,71 @@ void GLDraw_Crosshair(void)
{ {
SCR_CrosshairPosition(sc, &x, &y); SCR_CrosshairPosition(sc, &x, &y);
Font_BeginString(font_conchar, x, y, &x, &y); Font_BeginString(font_conchar, x, y, &x, &y);
Font_DrawChar(x-4, y-4, '+' | 0xe000 | CON_WHITEMASK); x -= Font_CharWidth('+' | 0xe000 | CON_WHITEMASK)/2;
y -= Font_CharHeight()/2;
Font_DrawChar(x, y, '+' | 0xe000 | CON_WHITEMASK);
Font_EndString(font_conchar); Font_EndString(font_conchar);
} }
return; return;
} }
shader = crosshair_shader;
if (*crosshairimage.string) if (*crosshairimage.string)
{ {
usingimage = true; usingimage = true;
GL_Bind (externalhair);
chc = 0; chc = 0;
qglEnable (GL_BLEND); shader->defaulttextures.base = externalhair;
qglDisable(GL_ALPHA_TEST);
} }
else if (crosshair.ival) else if (crosshair.ival)
{ {
GL_Bind (cs_texture);
chc = 1/16.0; chc = 1/16.0;
// force crosshair refresh with animated crosshairs // force crosshair refresh with animated crosshairs
if (crosshair.value >= FIRSTANIMATEDCROSHAIR) if (crosshair.ival >= FIRSTANIMATEDCROSHAIR)
GLCrosshair_Callback(&crosshair, ""); GLCrosshair_Callback(&crosshair, "");
if (crosshairalpha.ival<1) shader->defaulttextures.base = cs_texture;
{
qglEnable (GL_BLEND);
qglDisable(GL_ALPHA_TEST);
}
else
{
qglDisable (GL_BLEND);
qglEnable(GL_ALPHA_TEST);
}
} }
else else
return; return;
GL_TexEnv(GL_MODULATE);
if (usingimage)
qglColor4f(chcolor[0], chcolor[1], chcolor[2], crosshairalpha.ival);
else
qglColor4f(1, 1, 1, crosshairalpha.value);
size = crosshairsize.value; size = crosshairsize.value;
chc = size * chc;
if (gl_smoothcrosshair.ival && (size > 16 || usingimage)) if (size < 0)
{ {
qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); size = -size;
qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); sizex = size;
sizey = size;
chc = 0;
} }
else else
{ {
qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); sizex = (size*vid.pixelwidth) / (float)vid.width;
qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); sizey = (size*vid.pixelheight) / (float)vid.height;
chc = size * chc;
} }
sizex = (int)sizex;
sizex = ((sizex)*(int)vid.width) / (float)vid.pixelwidth;
sizey = (int)sizey;
sizey = ((sizey)*(int)vid.height) / (float)vid.pixelheight;
for (sc = 0; sc < cl.splitclients; sc++) for (sc = 0; sc < cl.splitclients; sc++)
{ {
SCR_CrosshairPosition(sc, &x, &y); SCR_CrosshairPosition(sc, &x, &y);
x1 = x - size - chc; //translate to pixel coord, for rounding
x2 = x + size - chc; x = ((x-sizex-chc)*vid.pixelwidth) / (float)vid.width;
y1 = y - size - chc; y = ((y-sizey-chc)*vid.pixelheight) / (float)vid.height;
y2 = y + size - chc;
qglBegin (GL_QUADS); //translate to screen coords
qglTexCoord2f (0, 0); sx = ((x)*(int)vid.width) / (float)vid.pixelwidth;
qglVertex2f (x1, y1); sy = ((y)*(int)vid.height) / (float)vid.pixelheight;
qglTexCoord2f (1, 0);
qglVertex2f (x2, y1); R2D_Image(sx, sy, sizex*2, sizey*2, 0, 0, 1, 1, shader);
qglTexCoord2f (1, 1);
qglVertex2f (x2, y2);
qglTexCoord2f (0, 1);
qglVertex2f (x1, y2);
qglEnd ();
} }
// GL_TexEnv ( GL_REPLACE );
// GL_TexEnv ( GL_MODULATE );
qglColor4f(1, 1, 1, 1);
} }
/* /*
@ -860,9 +865,6 @@ void GLDraw_BeginDisc (void)
{ {
if (!draw_disc || !r_drawdisk.value) if (!draw_disc || !r_drawdisk.value)
return; return;
qglDrawBuffer (GL_FRONT);
Draw_ScalePic(vid.width - 24, 0, 24, 24, draw_disc);
qglDrawBuffer (GL_BACK);
} }

2
engine/gl/gl_heightmap.c
View File

@ -761,7 +761,7 @@ qboolean GL_LoadHeightmapModel (model_t *mod, void *buffer)
mod->entities = COM_LoadHunkFile(entfile); mod->entities = COM_LoadHunkFile(entfile);
if (qrenderer>0) if (qrenderer != QR_NONE)
{ {
hm->detailtexture = R_LoadHiResTexture(detailtexname, "", IF_NOGAMMA); hm->detailtexture = R_LoadHiResTexture(detailtexname, "", IF_NOGAMMA);

1
engine/gl/gl_model.h
View File

@ -752,6 +752,7 @@ typedef struct model_s
char name[MAX_QPATH]; char name[MAX_QPATH];
qboolean needload; // bmodels and sprites don't cache normally qboolean needload; // bmodels and sprites don't cache normally
qboolean tainted; qboolean tainted;
qboolean pushdepth; // bsp submodels have this flag set so you don't get z fighting on co-planar surfaces.
modtype_t type; modtype_t type;
fromgame_t fromgame; fromgame_t fromgame;

2
engine/gl/gl_rmain.c
View File

@ -2037,7 +2037,7 @@ void GLR_RenderView (void)
if (qglPNTrianglesiATI) if (qglPNTrianglesiATI)
{ {
if (gl_ati_truform_type.value) if (gl_ati_truform_type.ival)
{ //linear { //linear
qglPNTrianglesiATI(GL_PN_TRIANGLES_NORMAL_MODE_ATI, GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI); qglPNTrianglesiATI(GL_PN_TRIANGLES_NORMAL_MODE_ATI, GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI);
qglPNTrianglesiATI(GL_PN_TRIANGLES_POINT_MODE_ATI, GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI); qglPNTrianglesiATI(GL_PN_TRIANGLES_POINT_MODE_ATI, GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI);

1
engine/gl/shader.h
View File

@ -386,6 +386,7 @@ typedef enum
#define BEF_FORCEADDITIVE 4 //blend dest = GL_ONE #define BEF_FORCEADDITIVE 4 //blend dest = GL_ONE
#define BEF_FORCETRANSPARENT 8 //texenv replace -> modulate #define BEF_FORCETRANSPARENT 8 //texenv replace -> modulate
#define BEF_FORCENODEPTH 16 //disables any and all depth. #define BEF_FORCENODEPTH 16 //disables any and all depth.
#define BEF_PUSHDEPTH 32 //additional polygon offset
//Select the current render mode and modifier flags //Select the current render mode and modifier flags
void BE_SelectMode(backendmode_t mode, unsigned int flags); void BE_SelectMode(backendmode_t mode, unsigned int flags);

10
engine/qclib/execloop.h
View File

@ -431,7 +431,7 @@ reeval:
st--; st--;
goto cont; goto cont;
#else #else
PR_RunError (progfuncs, "OP_ADDRESS references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name); PR_RunError (progfuncs, "OP_ADDRESS references invalid entity in %s", PR_StringToNative(progfuncs, pr_xfunction->s_name));
#endif #endif
} }
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
@ -448,7 +448,13 @@ reeval:
st--; st--;
goto cont; goto cont;
#else #else
PR_RunError (progfuncs, "assignment to read-only entity in %s", progfuncs->stringtable + pr_xfunction->s_name); {
ddef16_t *d16;
fdef_t *f;
d16 = ED_GlobalAtOfs16(progfuncs, st->a);
f = ED_FieldAtOfs(progfuncs, OPB->_int + progfuncs->fieldadjust);
PR_RunError (progfuncs, "assignment to read-only entity in %s (%s.%s)", PR_StringToNative(progfuncs, pr_xfunction->s_name), PR_StringToNative(progfuncs, d16->s_name), f?f->name:NULL);
}
#endif #endif
} }

1
engine/qclib/qcc_pr_comp.c
View File

@ -3430,6 +3430,7 @@ QCC_def_t *QCC_PR_ParseFunctionCall (QCC_def_t *func) //warning, the func could
{ {
//t = (a/%1) / (nextent(world)/%1) //t = (a/%1) / (nextent(world)/%1)
//a/%1 does a (int)entity to float conversion type thing //a/%1 does a (int)entity to float conversion type thing
func->initialized = 1;
e = QCC_PR_Expression(TOP_PRIORITY, EXPR_DISALLOW_COMMA); e = QCC_PR_Expression(TOP_PRIORITY, EXPR_DISALLOW_COMMA);
QCC_PR_Expect(")"); QCC_PR_Expect(")");

4
engine/server/pr_cmds.c
View File

@ -4818,7 +4818,9 @@ char *PF_infokey_Internal (int entnum, char *key)
if (!strcmp(key, "ip") || !strcmp(key, "realip")) //note: FTE doesn't support mvdsv's realip stuff, so pretend that we do if the mod asks if (!strcmp(key, "ip") || !strcmp(key, "realip")) //note: FTE doesn't support mvdsv's realip stuff, so pretend that we do if the mod asks
value = strcpy(ov, NET_BaseAdrToString (adr, sizeof(adr), svs.clients[entnum-1].netchan.remote_address)); value = strcpy(ov, NET_BaseAdrToString (adr, sizeof(adr), svs.clients[entnum-1].netchan.remote_address));
else if (!strcmp(key, "ping")) else if (!strcmp(key, "ping"))
sprintf(ov, "%d", SV_CalcPing (&svs.clients[entnum-1])); sprintf(ov, "%d", SV_CalcPing (&svs.clients[entnum-1], false));
else if (!strcmp(key, "svping"))
sprintf(ov, "%d", SV_CalcPing (&svs.clients[entnum-1], true));
else if (!strcmp(key, "*userid")) else if (!strcmp(key, "*userid"))
sprintf(ov, "%d", svs.clients[entnum-1].userid); sprintf(ov, "%d", svs.clients[entnum-1].userid);
else if (!strcmp(key, "download")) else if (!strcmp(key, "download"))

2
engine/server/server.h
View File

@ -922,7 +922,7 @@ void SV_DropClient (client_t *drop);
struct quakeparms_s; struct quakeparms_s;
void SV_Init (struct quakeparms_s *parms); void SV_Init (struct quakeparms_s *parms);
int SV_CalcPing (client_t *cl); int SV_CalcPing (client_t *cl, qboolean forcecalc);
void SV_FullClientUpdate (client_t *client, sizebuf_t *buf, unsigned int ftepext); void SV_FullClientUpdate (client_t *client, sizebuf_t *buf, unsigned int ftepext);
void SV_FullClientUpdateToClient (client_t *client, client_t *cl); void SV_FullClientUpdateToClient (client_t *client, client_t *cl);
void SVNQ_FullClientUpdate (client_t *client, sizebuf_t *buf); void SVNQ_FullClientUpdate (client_t *client, sizebuf_t *buf);

6
engine/server/sv_ccmds.c
View File

@ -437,7 +437,7 @@ void SV_Map_f (void)
nextserver = 0; nextserver = 0;
#ifndef SERVERONLY #ifndef SERVERONLY
if (qrenderer == -1) if (!Renderer_Started())
{ {
Cbuf_AddText(va("wait;map %s\n", Cmd_Args()), Cmd_ExecLevel); Cbuf_AddText(va("wait;map %s\n", Cmd_Args()), Cmd_ExecLevel);
return; return;
@ -1445,7 +1445,7 @@ void SV_Status_f (void)
} }
Con_Printf ("%4i %4i %5.2f\n" Con_Printf ("%4i %4i %5.2f\n"
, (int)(1000*cl->netchan.frame_rate) , (int)(1000*cl->netchan.frame_rate)
, (int)SV_CalcPing (cl) , (int)SV_CalcPing (cl, false)
, 100.0*cl->netchan.drop_count / cl->netchan.incoming_sequence); , 100.0*cl->netchan.drop_count / cl->netchan.incoming_sequence);
} }
} }
@ -1485,7 +1485,7 @@ void SV_Status_f (void)
else else
Con_Printf ("%4i %4i %5.1f %4i" Con_Printf ("%4i %4i %5.1f %4i"
, (int)(1000*cl->netchan.frame_rate) , (int)(1000*cl->netchan.frame_rate)
, (int)SV_CalcPing (cl) , (int)SV_CalcPing (cl, false)
, 100.0*cl->netchan.drop_count / cl->netchan.incoming_sequence , 100.0*cl->netchan.drop_count / cl->netchan.incoming_sequence
, cl->netchan.qport); , cl->netchan.qport);
if (cl->download) if (cl->download)

3
engine/server/sv_ents.c
View File

@ -300,7 +300,7 @@ void SV_EmitCSQCUpdate(client_t *client, sizebuf_t *msg)
csqcmsgbuffer.currentbit = 0; csqcmsgbuffer.currentbit = 0;
//Ask CSQC to write a buffer for it. //Ask CSQC to write a buffer for it.
G_INT(OFS_PARM0) = EDICT_TO_PROG(svprogfuncs, client->edict); G_INT(OFS_PARM0) = EDICT_TO_PROG(svprogfuncs, client->edict);
G_INT(OFS_PARM1) = 0xffffff; //psudo compatibility with SendFlags (fte doesn't support properly) G_FLOAT(OFS_PARM1) = 0xffffff; //psudo compatibility with SendFlags (fte doesn't support properly)
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, ent); pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, ent);
PR_ExecuteProgram(svprogfuncs, ent->xv->SendEntity); PR_ExecuteProgram(svprogfuncs, ent->xv->SendEntity);
if (G_INT(OFS_RETURN)) //0 means not to tell the client about it. if (G_INT(OFS_RETURN)) //0 means not to tell the client about it.
@ -2818,3 +2818,4 @@ void SV_CleanupEnts(void)
needcleanup=0; needcleanup=0;
} }
#endif #endif

5
engine/server/sv_init.c
View File

@ -586,11 +586,11 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
int spawnflagmask; int spawnflagmask;
#ifndef SERVERONLY #ifndef SERVERONLY
if (!isDedicated && (!qrenderer || qrenderer == -1)) if (!isDedicated && qrenderer == QR_NONE)
{ {
R_RestartRenderer_f(); R_RestartRenderer_f();
if (!qrenderer || qrenderer == -1) if (qrenderer == QR_NONE)
{ {
Sys_Error("No renderer set when map restarted\n"); Sys_Error("No renderer set when map restarted\n");
return; return;
@ -1428,3 +1428,4 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
} }
#endif #endif

13
engine/server/sv_main.c
View File

@ -340,7 +340,7 @@ void VARGS SV_Error (char *error, ...)
} }
#ifdef SERVERONLY #ifdef SERVERONLY
void VARGS Host_EndGame (char *error, ...) void VARGS Host_Error (char *error, ...)
{ {
va_list argptr; va_list argptr;
char string[1024]; char string[1024];
@ -734,7 +734,7 @@ SV_CalcPing
=================== ===================
*/ */
int SV_CalcPing (client_t *cl) int SV_CalcPing (client_t *cl, qboolean forcecalc)
{ {
float ping; float ping;
int i; int i;
@ -845,7 +845,7 @@ void SV_FullClientUpdate (client_t *client, sizebuf_t *buf, unsigned int ftepext
MSG_WriteByte (buf, svc_updateping); MSG_WriteByte (buf, svc_updateping);
MSG_WriteByte (buf, i); MSG_WriteByte (buf, i);
MSG_WriteShort (buf, SV_CalcPing (client)); MSG_WriteShort (buf, SV_CalcPing (client, false));
MSG_WriteByte (buf, svc_updatepl); MSG_WriteByte (buf, svc_updatepl);
MSG_WriteByte (buf, i); MSG_WriteByte (buf, i);
@ -994,7 +994,7 @@ void SVC_Status (void)
bottom = atoi(Info_ValueForKey (cl->userinfo, "bottomcolor")); bottom = atoi(Info_ValueForKey (cl->userinfo, "bottomcolor"));
top = (top < 0) ? 0 : ((top > 13) ? 13 : top); top = (top < 0) ? 0 : ((top > 13) ? 13 : top);
bottom = (bottom < 0) ? 0 : ((bottom > 13) ? 13 : bottom); bottom = (bottom < 0) ? 0 : ((bottom > 13) ? 13 : bottom);
ping = SV_CalcPing (cl); ping = SV_CalcPing (cl, false);
name = cl->name; name = cl->name;
if (!cl->state) //show bots differently. Just to be courteous. if (!cl->state) //show bots differently. Just to be courteous.
@ -1126,7 +1126,7 @@ void SVC_GetInfo (char *challenge, int fullstatus)
"%d %d \"%s\" \"%s\"\n" "%d %d \"%s\" \"%s\"\n"
, ,
cl->old_frags, cl->old_frags,
SV_CalcPing(cl), SV_CalcPing(cl, false),
cl->team, cl->team,
cl->name cl->name
), sizeof(response) - (resp-response)); ), sizeof(response) - (resp-response));
@ -4369,7 +4369,7 @@ void SV_Init (quakeparms_t *parms)
Cbuf_Init (); Cbuf_Init ();
Cmd_Init (); Cmd_Init ();
#ifndef SERVERONLY #ifndef SERVERONLY
R_SetRenderer(QR_NONE); R_SetRenderer(NULL);
#endif #endif
COM_Init (); COM_Init ();
Mod_Init (); Mod_Init ();
@ -4479,3 +4479,4 @@ void SV_Init (quakeparms_t *parms)
} }
#endif #endif

4
engine/server/sv_mvd.c
View File

@ -766,7 +766,7 @@ void SV_MVDPings (void)
MVDWrite_Begin (dem_all, 0, 7); MVDWrite_Begin (dem_all, 0, 7);
MSG_WriteByte((sizebuf_t*)demo.dbuf, svc_updateping); MSG_WriteByte((sizebuf_t*)demo.dbuf, svc_updateping);
MSG_WriteByte((sizebuf_t*)demo.dbuf, j); MSG_WriteByte((sizebuf_t*)demo.dbuf, j);
MSG_WriteShort((sizebuf_t*)demo.dbuf, SV_CalcPing(client)); MSG_WriteShort((sizebuf_t*)demo.dbuf, SV_CalcPing(client, false));
MSG_WriteByte((sizebuf_t*)demo.dbuf, svc_updatepl); MSG_WriteByte((sizebuf_t*)demo.dbuf, svc_updatepl);
MSG_WriteByte ((sizebuf_t*)demo.dbuf, j); MSG_WriteByte ((sizebuf_t*)demo.dbuf, j);
MSG_WriteByte ((sizebuf_t*)demo.dbuf, client->lossage); MSG_WriteByte ((sizebuf_t*)demo.dbuf, client->lossage);
@ -1847,7 +1847,7 @@ void SV_MVD_SendInitialGamestate(mvddest_t *dest)
MSG_WriteByte (&buf, svc_updateping); MSG_WriteByte (&buf, svc_updateping);
MSG_WriteByte (&buf, i); MSG_WriteByte (&buf, i);
MSG_WriteShort (&buf, SV_CalcPing(player)); MSG_WriteShort (&buf, SV_CalcPing(player, false));
MSG_WriteByte (&buf, svc_updatepl); MSG_WriteByte (&buf, svc_updatepl);
MSG_WriteByte (&buf, i); MSG_WriteByte (&buf, i);

14
engine/server/sv_user.c
View File

@ -2801,7 +2801,7 @@ void SV_Pings_f (void)
ClientReliableWrite_SZ(host_client, "pingplreport", 12); ClientReliableWrite_SZ(host_client, "pingplreport", 12);
for (j = 0, client = svs.clients; j < MAX_CLIENTS; j++, client++) for (j = 0, client = svs.clients; j < MAX_CLIENTS; j++, client++)
{ {
s = va(" %i %i", SV_CalcPing(client), client->lossage); s = va(" %i %i", SV_CalcPing(client, false), client->lossage);
ClientReliableWrite_SZ(host_client, s, strlen(s)); ClientReliableWrite_SZ(host_client, s, strlen(s));
} }
ClientReliableWrite_Byte (host_client, '\n'); ClientReliableWrite_Byte (host_client, '\n');
@ -2817,7 +2817,7 @@ void SV_Pings_f (void)
ClientReliableWrite_Begin (host_client, svc_updateping, 4); ClientReliableWrite_Begin (host_client, svc_updateping, 4);
ClientReliableWrite_Byte (host_client, j); ClientReliableWrite_Byte (host_client, j);
ClientReliableWrite_Short (host_client, SV_CalcPing(client)); ClientReliableWrite_Short (host_client, SV_CalcPing(client, false));
ClientReliableWrite_Begin (host_client, svc_updatepl, 4); ClientReliableWrite_Begin (host_client, svc_updatepl, 4);
ClientReliableWrite_Byte (host_client, j); ClientReliableWrite_Byte (host_client, j);
ClientReliableWrite_Byte (host_client, client->lossage); ClientReliableWrite_Byte (host_client, client->lossage);
@ -3857,7 +3857,7 @@ void Cmd_FPSList_f(void)
} }
if (frames) if (frames)
SV_ClientPrintf(host_client, PRINT_HIGH, "%s: %ffps (min%f max %f), in: %fbps, out: %fbps\n", cl->name, ftime/frames, minf, maxf, (1000.0f*inbytes)/msecs, (1000.0f*outbytes)/msecs); SV_ClientPrintf(host_client, PRINT_HIGH, "%s: %ffps (min%.2f max %.2f), in: %.2fbps, out: %.2fbps\n", cl->name, ftime/frames, minf, maxf, (1000.0f*inbytes)/msecs, (1000.0f*outbytes)/msecs);
else else
SV_ClientPrintf(host_client, PRINT_HIGH, "%s: no information available\n", cl->name); SV_ClientPrintf(host_client, PRINT_HIGH, "%s: no information available\n", cl->name);
} }
@ -4478,7 +4478,7 @@ void SVNQ_Ping_f(void)
if (!cl->state) if (!cl->state)
continue; continue;
SV_PrintToClient(host_client, PRINT_HIGH, va("%3i %s\n", SV_CalcPing (cl), cl->name)); SV_PrintToClient(host_client, PRINT_HIGH, va("%3i %s\n", SV_CalcPing (cl, false), cl->name));
} }
} }
@ -5075,7 +5075,7 @@ void SV_RunCmd (usercmd_t *ucmd, qboolean recurse)
V_CalcRoll (sv_player->v->angles, sv_player->v->velocity)*4; V_CalcRoll (sv_player->v->angles, sv_player->v->velocity)*4;
} }
if (SV_PlayerPhysicsQC) if (SV_PlayerPhysicsQC && !host_client->spectator)
{ //csqc independant physics support { //csqc independant physics support
pr_global_struct->frametime = host_frametime; pr_global_struct->frametime = host_frametime;
pr_global_struct->time = sv.time; pr_global_struct->time = sv.time;
@ -5745,7 +5745,7 @@ haveannothergo:
} }
SV_RunCmd (&newcmd, false); SV_RunCmd (&newcmd, false);
if (!SV_PlayerPhysicsQC) if (!SV_PlayerPhysicsQC || host_client->spectator)
SV_PostRunCmd(); SV_PostRunCmd();
} }
@ -6536,7 +6536,7 @@ void SV_ClientThink (void)
sv_player->xv->movement[2] = cmd.upmove; sv_player->xv->movement[2] = cmd.upmove;
} }
if (SV_PlayerPhysicsQC) if (SV_PlayerPhysicsQC && !host_client->spectator)
{ {
pr_global_struct->time = sv.world.physicstime; pr_global_struct->time = sv.world.physicstime;
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, sv_player); pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, sv_player);