new entity protocol has been canceled due to a fatal design flaw only detected today...

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index fedd02b5a876940800ee52686ecbe027923bef83..03e340702f19cd01f4900e44344f39289f932fd0 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -446,7 +446,8 @@ dlightsetup:
        //Con_Printf("dlight %i : %f %f %f : %f %f %f\n", i, org[0], org[1], org[2], red * radius, green * radius, blue * radius);
        memset (dl, 0, sizeof(*dl));
        dl->ent = ent;
-       VectorCopy(org, dl->origin);
+       Mod_FindNonSolidLocation(org, dl->origin, cl.worldmodel, 6);
+       //VectorCopy(org, dl->origin);
        dl->radius = radius;
        dl->color[0] = red;
        dl->color[1] = green;
@@ -1004,7 +1005,7 @@ void CL_RelinkBeams (void)
                        //ent->render.angles[0] = pitch;
                        //ent->render.angles[1] = yaw;
                        //ent->render.angles[2] = rand()%360;
-                       Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, org[0], org[1], org[2], pitch, yaw, lhrandom(0, 360), 1);
+                       Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, org[0], org[1], org[2], -pitch, yaw, lhrandom(0, 360), 1);
                        Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
                        CL_BoundingBoxForEntity(&ent->render);
                        VectorMA(org, 30, dist, org);
@@ -1571,7 +1572,7 @@ static void CL_PModel_f (void)
        }
 
        host_client->pmodel = i;
-       if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
+       if ((val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)))
                val->_float = i;
 }