Made minimal builds compile again, hopefully.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2712 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2007-10-05 14:11:17 +00:00
parent 609ea3a9d9
commit f9277a9e74
5 changed files with 24 additions and 1 deletions

View file

@ -3890,11 +3890,13 @@ void CL_ParseStuffCmd(char *msg, int destsplit) //this protects stuffcmds from n
{ {
Cmd_ExecuteString(stufftext+2, RESTRICT_SERVER+destsplit); //do this NOW so that it's done before any models or anything are loaded Cmd_ExecuteString(stufftext+2, RESTRICT_SERVER+destsplit); //do this NOW so that it's done before any models or anything are loaded
} }
#ifdef PLUGINS
else if (!strncmp(stufftext, "//tinfo ", 8)) else if (!strncmp(stufftext, "//tinfo ", 8))
{ {
Cmd_TokenizeString(stufftext+2, false, false); Cmd_TokenizeString(stufftext+2, false, false);
Plug_Command_f(); Plug_Command_f();
} }
#endif
else else
#ifdef CSQC_DAT #ifdef CSQC_DAT
if (!CSQC_StuffCmd(stufftext)) if (!CSQC_StuffCmd(stufftext))

View file

@ -1917,6 +1917,23 @@ void R_DrawGAliasModel (entity_t *e)
-scale_origin[2]); -scale_origin[2]);
} }
if (!ruleset_allow_overlarge_models.value && clmodel->clampedsize)
{ //possibly this should be on a per-frame basis, but that's a real pain to do
float rad=0, axis;
axis = (clmodel->maxs[0] - clmodel->mins[0]);
rad += axis*axis;
axis = (clmodel->maxs[1] - clmodel->mins[1]);
rad += axis*axis;
axis = (clmodel->maxs[2] - clmodel->mins[2]);
rad += axis*axis;
if (rad > clmodel->clampedsize)
{
rad = clmodel->clampedsize / rad;
Con_DPrintf("Rescaling %s by %f\n", clmodel->name, rad);
qglScalef(rad, rad, rad);
}
}
inf = GLMod_Extradata (clmodel); inf = GLMod_Extradata (clmodel);
if (qglPNTrianglesfATI && gl_ati_truform.value) if (qglPNTrianglesfATI && gl_ati_truform.value)
qglEnable(GL_PN_TRIANGLES_ATI); qglEnable(GL_PN_TRIANGLES_ATI);

View file

@ -195,10 +195,12 @@ pbool ED_CanFree (edict_t *ed)
ed->v->nextthink = 0; ed->v->nextthink = 0;
ed->v->solid = 0; ed->v->solid = 0;
ed->v->classname = 0;
if (pr_imitatemvdsv.value) if (pr_imitatemvdsv.value)
{ {
ed->v->health = 0; ed->v->health = 0;
ed->v->classname = 0;
ed->v->nextthink = -1; ed->v->nextthink = -1;
ed->v->impulse = 0; //this is not true imitation, but it seems we need this line to get out of some ktpro infinate loops. ed->v->impulse = 0; //this is not true imitation, but it seems we need this line to get out of some ktpro infinate loops.
} }

View file

@ -442,6 +442,7 @@ void SV_DropClient (client_t *drop)
// this will set the body to a dead frame, among other things // this will set the body to a dead frame, among other things
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, drop->edict); pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, drop->edict);
PR_ExecuteProgram (svprogfuncs, pr_global_struct->ClientDisconnect); PR_ExecuteProgram (svprogfuncs, pr_global_struct->ClientDisconnect);
printf("Disconnected...\n");
} }
else if (SpectatorDisconnect) else if (SpectatorDisconnect)
{ {

View file

@ -1449,6 +1449,7 @@ void SV_Begin_f (void)
pr_global_struct->time = sv.time; pr_global_struct->time = sv.time;
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, split->edict); pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, split->edict);
PR_ExecuteProgram (svprogfuncs, pr_global_struct->ClientConnect); PR_ExecuteProgram (svprogfuncs, pr_global_struct->ClientConnect);
printf("ClientConnected...\n");
// actually spawn the player // actually spawn the player
pr_global_struct->time = sv.time; pr_global_struct->time = sv.time;