Merge branch 'master' into mirceakitsune/per_character_sounds

diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index 101ab9f019ad561e836b832a69f6941d2edac2b1..dbd8ab2ad89fd7429a8b8349ccd54634e8aacd16 100644 (file)
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -16,6 +16,13 @@ void Draw_CylindricLine(vector from, vector to, float thickness, string texture,
        // direction is perpendicular to the view normal, and perpendicular to the axis
        thickdir = normalize(cross(axis, view_origin - from));
 
+/*
+       print("from ", vtos(from), "\n");
+       print("to ", vtos(to), "\n");
+       print("org ", vtos(view_origin), "\n");
+       print("dir ", vtos(thickdir), "\n");
+*/
+
        A = from - thickdir * (thickness / 2);
        B = from + thickdir * (thickness / 2);
        C = to + thickdir * (thickness / 2);

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index df700faafc8fda2cf9b02d63cc87e0ded350be0c..ba363f0c0a273e32914981baea57a9b7fa30cd1c 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1058,7 +1058,6 @@ float ClientInit_SendEntity(entity to, float sf)
        WriteCoord(MSG_ENTITY, hook_shotorigin_x);
        WriteCoord(MSG_ENTITY, hook_shotorigin_y);
        WriteCoord(MSG_ENTITY, hook_shotorigin_z);
-
        if(sv_foginterval && world.fog != "")
                WriteString(MSG_ENTITY, world.fog);
        else
@@ -1099,10 +1098,11 @@ void ClientInit_Spawn()
 {
        entity o;
        entity e;
+       e = spawn();
        e.classname = "clientinit";
        e.think = ClientInit_CheckUpdate;
-       e.nextthink = time;
        Net_LinkEntity(e, FALSE, 0, ClientInit_SendEntity);
+
        o = self;
        self = e;
        ClientInit_CheckUpdate();