Merge branch 'master' into terencehill/arena_and_ca_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / miscfunctions.qc

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 6ad35331ea5e67423a75c51afca8e5c197843fcf..93a47f50e5f5d94cf5fb0298bf16ea0003399824 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -575,7 +575,7 @@ vector getplayerorigin(float pl)
        string s;
        entity e;
 
-       e = CSQCPlayer_GetPlayer(pl + 1);
+       e = CSQCModel_server2csqc(pl + 1);
        if(e)
                return e.origin;
 
@@ -591,3 +591,14 @@ vector getplayerorigin(float pl)
 
        return GETPLAYERORIGIN_ERROR;
 }
+
+float getplayerisdead(float pl)
+{
+       entity e;
+       
+       e = CSQCModel_server2csqc(pl + 1);
+       if(e)
+               return e.csqcmodel_isdead;
+       
+       return FALSE;
+}
\ No newline at end of file