remove TEMPHACK_origin

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 1a512c77481260b2aa9a29de4ddd981d1df8a168..26bed80f2a1621592c40d023e6ee8513a343dc99 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -575,9 +575,9 @@ vector getplayerorigin(float pl)
        string s;
        entity e;
 
-       s = getplayerkey(pl, "TEMPHACK_origin");
-       if(s != "")
-               return stov(s);
+       e = CSQCPlayer_GetPlayer(pl + 1);
+       if(e)
+               return e.origin;
 
        e = entcs_receiver[pl];
        if(e)

diff --git a/qcsrc/csqcmodel/cl_player.qc b/qcsrc/csqcmodel/cl_player.qc
index f427073e15abe2b761f3a6c5a6defcba39eb6fe6..9732bd573b17718bf93947cd6a56b7cdef2c38d0 100644 (file)
--- a/qcsrc/csqcmodel/cl_player.qc
+++ b/qcsrc/csqcmodel/cl_player.qc
@@ -179,3 +179,8 @@ float CSQCPlayer_PostUpdate()
        csqcplayer = self;
        return 1;
 }
+
+entity CSQCPlayer_GetPlayer(float pl)
+{
+       return findfloat(world, entnum, pl); // FIXME optimize this using an array
+}

diff --git a/qcsrc/csqcmodel/cl_player.qh b/qcsrc/csqcmodel/cl_player.qh
index 0eecabed88e05e626d5be5a98799480de7bc4a21..f85c4e7cd03cf0b2d5c8427a07178d82c8281ad7 100644 (file)
--- a/qcsrc/csqcmodel/cl_player.qh
+++ b/qcsrc/csqcmodel/cl_player.qh
@@ -29,3 +29,4 @@ void CSQCPlayer_SetCamera();
 float CSQCPlayer_PreUpdate();
 float CSQCPlayer_PostUpdate();
 float CSQCPlayer_IsLocalPlayer();
+entity CSQCPlayer_GetPlayer(float pl);