Merge branch 'master' into divVerent/csqcmodel

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

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index ce779634c66487200fca102a2d9aa1365216a881..c63a7952dfef634f29fab3362565405e637b0871 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -114,7 +114,7 @@ entity GetTeam(float Team, float add)
        if(teamslots[num])
                return teamslots[num];
        if not(add)
-               return NULL;
+               return world;
        tm = spawn();
        tm.team = Team;
        teamslots[num] = tm;
@@ -278,7 +278,7 @@ var float _drawpic_oldsz;
 var string _drawpic_picpath;
 #define drawpic_aspect(pos,pic,mySize,color,alpha,drawflag)\
        do {\
-               _drawpic_imgsize = drawgetimagesize(pic);\
+               _drawpic_imgsize = draw_getimagesize(pic);\
                _drawpic_imgaspect = _drawpic_imgsize_x/_drawpic_imgsize_y;\
                _drawpic_sz = mySize;\
                if(_drawpic_sz_x/_drawpic_sz_y > _drawpic_imgaspect) {\
@@ -580,7 +580,7 @@ vector getplayerorigin(float pl)
                return e.origin;
 
 #ifndef NO_LEGACY_NETWORKING
-       s = getplayerkey(pl, "TEMPHACK_origin");
+       s = getplayerkeyvalue(pl, "TEMPHACK_origin");
        if(s != "")
                return stov(s);
 #endif