Merge remote-tracking branch 'origin/master' into fruitiex/panelhud

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index fc7657b721a2d1190249dc2d084264b8da1c9784..91f40332df3d2422c94df69375554fd9d0d61a92 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -654,6 +654,10 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 
 // --------------------------------------------------------------------------
 // BEGIN OPTIONAL CSQC FUNCTIONS
+void Ent_RemoveEntCS()
+{
+       entcs_receiver[self.sv_entnum] = world;
+}
 void Ent_ReadEntCS()
 {
        InterpolateOrigin_Undo();
@@ -666,6 +670,7 @@ void Ent_ReadEntCS()
        self.angles_y = ReadByte() * 360.0 / 256;
        self.origin_z = self.angles_x = self.angles_z = 0;
        entcs_receiver[self.sv_entnum] = self;
+       self.entremove = Ent_RemoveEntCS;
 
        InterpolateOrigin_Note();
 }

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index fdaaf7da6d5ef03c5ee2aaf1918f80f24ba1fb82..d59c75ba8d81629cfc485bea7499a6fe32a9a60a 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -759,10 +759,15 @@ const vector GETPLAYERORIGIN_ERROR = '1123581321 2357111317 3141592653'; // way
 vector getplayerorigin(float pl)
 {
        string s;
+       entity e;
+
        s = getplayerkey(pl, "TEMPHACK_origin");
        if(s != "")
                return stov(s);
-       if(entcs_receiver[pl].classname == "entcs_receiver")
-               return entcs_receiver[pl].origin;
+
+       e = entcs_receiver[pl];
+       if(e)
+               return e.origin;
+
        return GETPLAYERORIGIN_ERROR;
 }