globally rename model_t to dp_model_t for OpenSolaris. Sorry, guys who now have svn...

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 7fd83d30c2de5c29a39b5b3fe548b1adec3ed69e..bbef89ce48d0ed25865d1a5dc79b0e1bb45730f3 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -94,6 +94,9 @@ char *svc_strings[128] =
        "svc_entities", //                      57              // [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata
        "svc_csqcentities", //          58              // [short] entnum [variable length] entitydata ... [short] 0x0000
        "svc_spawnstaticsound2", //     59              // [coord3] [short] samp [byte] vol [byte] aten
+       "svc_trailparticles", //        60              // [short] entnum [short] effectnum [vector] start [vector] end
+       "svc_pointparticles", //        61              // [short] effectnum [vector] start [vector] velocity [short] count
+       "svc_pointparticles1", //       62              // [short] effectnum [vector] start, same as svc_pointparticles except velocity is zero and count is 1
 };
 
 char *qw_svc_strings[128] =
@@ -397,9 +400,9 @@ static void CL_SetupWorldModel(void)
 
        // set up csqc world for collision culling
        if (cl.worldmodel)
-               World_SetSize(&cl.world, cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);
+               World_SetSize(&cl.world, cl.worldmodel->name, cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);
        else
-               World_SetSize(&cl.world, defaultmins, defaultmaxs);
+               World_SetSize(&cl.world, "", defaultmins, defaultmaxs);
 
        // load or reload .loc file for team chat messages
        CL_Locs_Reload_f();
@@ -1633,7 +1636,7 @@ void CL_ParseServerInfo (void)
 
 void CL_ValidateState(entity_state_t *s)
 {
-       model_t *model;
+       dp_model_t *model;
 
        if (!s->active)
                return;
@@ -1973,7 +1976,7 @@ void CL_ParseEffect2 (void)
        CL_Effect(org, modelindex, startframe, framecount, framerate);
 }
 
-void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning)
+void CL_NewBeam (int ent, vec3_t start, vec3_t end, dp_model_t *m, int lightning)
 {
        int i;
        beam_t *b = NULL;
@@ -2012,7 +2015,7 @@ void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning)
                Con_Print("beam list overflow!\n");
 }
 
-void CL_ParseBeam (model_t *m, int lightning)
+void CL_ParseBeam (dp_model_t *m, int lightning)
 {
        int ent;
        vec3_t start, end;
@@ -2957,7 +2960,7 @@ static void CL_NetworkTimeReceived(double newtime)
        }
        // this packet probably contains a player entity update, so we will need
        // to update the prediction
-       cl.movement_needupdate = true;
+       cl.movement_replay = true;
        // this may get updated later in parsing by svc_clientdata
        cl.onground = false;
        // if true the cl.viewangles are interpolated from cl.mviewangles[]
@@ -2969,7 +2972,7 @@ static void CL_NetworkTimeReceived(double newtime)
                VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
 }
 
-#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x);
+#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s(%i)\n", msg_readcount-1, x, cmd);
 
 //[515]: csqc
 qboolean CL_VM_Parse_TempEntity (void);
@@ -3559,7 +3562,7 @@ void CL_ParseServerMessage(void)
                                        {
                                                if (i >= 1 && i < MAX_MODELS)
                                                {
-                                                       model_t *model = Mod_ForName(s, false, false, i == 1);
+                                                       dp_model_t *model = Mod_ForName(s, false, false, i == 1);
                                                        if (!model)
                                                                Con_DPrintf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
                                                        cl.model_precache[i] = model;