finished model/map rendering merge, model renderer has been completely removed

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index f90512d5c6490f9fcac7c2de17251575836782d2..2e2f18a6b8636410a57799dce1f1c3c551780e1f 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -40,6 +40,8 @@ cvar_t sv_gameplayfix_stepdown = {0, "sv_gameplayfix_stepdown", "1"};
 cvar_t sv_gameplayfix_stepwhilejumping = {0, "sv_gameplayfix_stepwhilejumping", "1"};
 cvar_t sv_gameplayfix_swiminbmodels = {0, "sv_gameplayfix_swiminbmodels", "1"};
 cvar_t sv_gameplayfix_setmodelrealbox = {0, "sv_gameplayfix_setmodelrealbox", "1"};
+cvar_t sv_gameplayfix_blowupfallenzombies = {0, "sv_gameplayfix_blowupfallenzombies", "1"};
+cvar_t sv_gameplayfix_findradiusdistancetobox = {0, "sv_gameplayfix_findradiusdistancetobox", "1"};
 
 cvar_t sv_progs = {0, "sv_progs", "progs.dat" };
 
@@ -83,6 +85,8 @@ void SV_Init (void)
        Cvar_RegisterVariable (&sv_gameplayfix_stepwhilejumping);
        Cvar_RegisterVariable (&sv_gameplayfix_swiminbmodels);
        Cvar_RegisterVariable (&sv_gameplayfix_setmodelrealbox);
+       Cvar_RegisterVariable (&sv_gameplayfix_blowupfallenzombies);
+       Cvar_RegisterVariable (&sv_gameplayfix_findradiusdistancetobox);
        Cvar_RegisterVariable (&sv_protocolname);
        Cvar_RegisterVariable (&sv_ratelimitlocalplayer);
        Cvar_RegisterVariable (&sv_maxrate);
@@ -469,10 +473,10 @@ void SV_PrepareEntitiesForSending(void)
                VectorCopy(ent->v->origin, cs.origin);
                VectorCopy(ent->v->angles, cs.angles);
                cs.flags = 0;
-               cs.effects = (int)ent->v->effects;
-               cs.colormap = (qbyte)ent->v->colormap;
-               cs.skin = (qbyte)ent->v->skin;
-               cs.frame = (qbyte)ent->v->frame;
+               cs.effects = (unsigned)ent->v->effects;
+               cs.colormap = (unsigned)ent->v->colormap;
+               cs.skin = (unsigned)ent->v->skin;
+               cs.frame = (unsigned)ent->v->frame;
                cs.viewmodelforclient = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)->edict;
                cs.exteriormodelforclient = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)->edict;
                cs.nodrawtoclient = GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)->edict;