trying to fix many forward references in input code

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index 980e14f3c78666d717c07c518a5c6bc5c36ae0b6..9dd462f3db55fc27c121c9f2517a3a1590a9e45d 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -383,6 +383,7 @@ void SV_CheckForNewClients (void)
                SV_ConnectClient (i);
 
                net_activeconnections++;
+               NET_Heartbeat ();
        }
 }
 
@@ -489,7 +490,7 @@ loc0:
        }
 
        // node - recurse down the BSP tree
-       switch (BOX_ON_PLANE_SIDE(mins, maxs, node->plane))
+       switch (BoxOnPlaneSide(mins, maxs, node->plane))
        {
        case 1: // front
                node = node->children[0];
@@ -518,11 +519,11 @@ SV_WriteEntitiesToClient
 #ifdef QUAKEENTITIES
 void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
 {
-       int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects;
+       int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects, lightsize;
        int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
        qbyte *pvs;
        vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
-       float nextfullupdate;
+       float nextfullupdate, alphaf;
        edict_t *ent;
        eval_t *val;
        entity_state_t *baseline; // LordHavoc: delta or startup baseline
@@ -690,23 +691,23 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                        visibleentities++;
                }
 
-               alpha = 255;
+               alphaf = 255.0f;
                scale = 16;
                glowcolor = 254;
                effects = ent->v.effects;
 
                if ((val = GETEDICTFIELDVALUE(ent, eval_alpha)))
                if (val->_float != 0)
-                       alpha = (int) (val->_float * 255.0);
+                       alphaf = val->_float * 255.0f;
 
                // HalfLife support
                if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt)))
                if (val->_float != 0)
-                       alpha = (int) val->_float;
+                       alphaf = val->_float;
 
-               if (alpha == 0)
-                       alpha = 255;
-               alpha = bound(0, alpha, 255);
+               if (alphaf == 0.0f)
+                       alphaf = 255.0f;
+               alpha = bound(0, alphaf, 255);
 
                if ((val = GETEDICTFIELDVALUE(ent, eval_scale)))
                if ((scale = (int) (val->_float * 16.0)) == 0) scale = 16;
@@ -863,8 +864,9 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
 #else
 void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
 {
-       int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects;
+       int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects, modelindex;
        int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
+       float alphaf, lightsize;
        qbyte *pvs;
        vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
        edict_t *ent;
@@ -880,9 +882,19 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
        Mod_CheckLoaded(sv.worldmodel);
 
 // find the client's PVS
+       // the real place being tested from
        VectorAdd (clent->v.origin, clent->v.view_ofs, testeye);
        pvs = SV_FatPVS (testeye);
-       EntityFrame_Clear(&entityframe, testeye);
+
+       // the place being reported (to consider the fact the client still
+       // applies the view_ofs[2], so we have to only send the fractional part
+       // of view_ofs[2], undoing what the client will redo)
+       VectorCopy (testeye, testorigin);
+       e = (int) clent->v.view_ofs[2] & 255;
+       if (e >= 128)
+               e -= 256;
+       testorigin[2] -= (float) e;
+       EntityFrame_Clear(&entityframe, testorigin);
 
        culled_pvs = 0;
        culled_portal = 0;
@@ -920,17 +932,45 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                }
 
                glowsize = 0;
-
+               effects = ent->v.effects;
                if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size)))
                        glowsize = (int) val->_float >> 2;
                glowsize = bound(0, glowsize, 255);
 
+               lightsize = 0;
+               if (effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST))
+               {
+                       if (effects & EF_BRIGHTFIELD)
+                               lightsize = max(lightsize, 80);
+                       if (effects & EF_MUZZLEFLASH)
+                               lightsize = max(lightsize, 100);
+                       if (effects & EF_BRIGHTLIGHT)
+                               lightsize = max(lightsize, 400);
+                       if (effects & EF_DIMLIGHT)
+                               lightsize = max(lightsize, 200);
+                       if (effects & EF_RED)
+                               lightsize = max(lightsize, 200);
+                       if (effects & EF_BLUE)
+                               lightsize = max(lightsize, 200);
+                       if (effects & EF_FLAME)
+                               lightsize = max(lightsize, 250);
+                       if (effects & EF_STARDUST)
+                               lightsize = max(lightsize, 100);
+               }
+               if (glowsize)
+                       lightsize = max(lightsize, glowsize << 2);
+
                if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail)))
                if (val->_float != 0)
+               {
                        flags |= RENDER_GLOWTRAIL;
+                       lightsize = max(lightsize, 100);
+               }
 
+               modelindex = 0;
                if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model])
                {
+                       modelindex = ent->v.modelindex;
                        model = sv.models[(int)ent->v.modelindex];
                        Mod_CheckLoaded(model);
                }
@@ -938,7 +978,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                {
                        model = NULL;
                        if (ent != clent) // LordHavoc: always send player
-                               if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
+                               if (lightsize == 0) // no effects
                                        continue;
                }
 
@@ -985,6 +1025,15 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                                        VectorAdd(entmaxs, model->normalmaxs, entmaxs);
                                }
                        }
+                       if (lightsize)
+                       {
+                               entmins[0] = min(entmins[0], origin[0] - lightsize);
+                               entmins[1] = min(entmins[1], origin[1] - lightsize);
+                               entmins[2] = min(entmins[2], origin[2] - lightsize);
+                               entmaxs[0] = min(entmaxs[0], origin[0] + lightsize);
+                               entmaxs[1] = min(entmaxs[1], origin[1] + lightsize);
+                               entmaxs[2] = min(entmaxs[2], origin[2] + lightsize);
+                       }
 
                        totalentities++;
 
@@ -1025,23 +1074,23 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                        visibleentities++;
                }
 
-               alpha = 255;
+               alphaf = 255.0f;
                scale = 16;
                glowcolor = 254;
                effects = ent->v.effects;
 
                if ((val = GETEDICTFIELDVALUE(ent, eval_alpha)))
                if (val->_float != 0)
-                       alpha = (int) (val->_float * 255.0);
+                       alphaf = val->_float * 255.0;
 
                // HalfLife support
                if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt)))
                if (val->_float != 0)
-                       alpha = (int) val->_float;
+                       alphaf = val->_float;
 
-               if (alpha == 0)
-                       alpha = 255;
-               alpha = bound(0, alpha, 255);
+               if (alphaf == 0.0f)
+                       alphaf = 255.0f;
+               alpha = bound(0, alphaf, 255);
 
                if ((val = GETEDICTFIELDVALUE(ent, eval_scale)))
                if ((scale = (int) (val->_float * 16.0)) == 0) scale = 16;
@@ -1058,7 +1107,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
 
                if (ent != clent)
                {
-                       if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
+                       if (lightsize == 0) // no effects
                        {
                                if (model) // model
                                {
@@ -1086,10 +1135,12 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
                        break;
                VectorCopy(origin, s->origin);
                VectorCopy(angles, s->angles);
+               if (ent->v.colormap >= 1024)
+                       flags |= RENDER_COLORMAPPED;
                s->colormap = ent->v.colormap;
                s->skin = ent->v.skin;
                s->frame = ent->v.frame;
-               s->modelindex = ent->v.modelindex;
+               s->modelindex = modelindex;
                s->effects = effects;
                s->alpha = alpha;
                s->scale = scale;
@@ -1169,7 +1220,8 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
 
        bits = 0;
 
-       bits |= SU_VIEWHEIGHT;
+       if (ent->v.view_ofs[2] != DEFAULT_VIEWHEIGHT)
+               bits |= SU_VIEWHEIGHT;
 
        if (ent->v.idealpitch)
                bits |= SU_IDEALPITCH;
@@ -1243,8 +1295,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
                MSG_WriteByte(msg, bits >> 24);
 
        if (bits & SU_VIEWHEIGHT)
-               //MSG_WriteChar (msg, ent->v.view_ofs[2]);
-               MSG_WriteChar (msg, 0);
+               MSG_WriteChar (msg, ent->v.view_ofs[2]);
 
        if (bits & SU_IDEALPITCH)
                MSG_WriteChar (msg, ent->v.idealpitch);
@@ -1492,9 +1543,9 @@ SV_ModelIndex
 
 ================
 */
-int SV_ModelIndex (char *name)
+int SV_ModelIndex (const char *name)
 {
-       int             i;
+       int i;
 
        if (!name || !name[0])
                return 0;
@@ -1643,7 +1694,7 @@ This is called at the start of each level
 */
 extern float           scr_centertime_off;
 
-void SV_SpawnServer (char *server)
+void SV_SpawnServer (const char *server)
 {
        edict_t         *ent;
        int                     i;
@@ -1792,5 +1843,6 @@ void SV_SpawnServer (char *server)
                        SV_SendServerinfo (host_client);
 
        Con_DPrintf ("Server spawned.\n");
+       NET_Heartbeat ();
 }