Merge branch 'master' into Mario/stats_eloranking

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / debug.qh

diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh
index b26c19d9a7a718d1608da69e0a41c24165227896..55b634a624ce91619b15054f7325ca5cbe071cd7 100644 (file)
--- a/qcsrc/common/debug.qh
+++ b/qcsrc/common/debug.qh
@@ -205,8 +205,7 @@ GENERIC_COMMAND(bufstr_get, "Examine a string buffer object")
                {
                        int bufhandle = stof(argv(1));
                        int string_index = stof(argv(2));
-                       string s = bufstr_get(bufhandle, string_index);
-                       LOG_INFOF("%s", s);
+                       LOG_INFO(bufstr_get(bufhandle, string_index));
                        return;
                }
 
@@ -407,7 +406,7 @@ CLASS(DebugText3d, Object)
                CONSTRUCT(DebugText3d);
                this.origin = pos;
                this.message = strzone(msg);
-               SetResourceAmount(this, RESOURCE_HEALTH, align);
+               SetResource(this, RES_HEALTH, align);
                this.hit_time = time;
                this.fade_rate = fade_rate_;
                this.velocity = vel;
@@ -432,7 +431,7 @@ CLASS(DebugText3d, Object)
                if (screen_pos.z < 0) return; // behind camera
 
                screen_pos.z = 0;
-               float align = GetResourceAmount(this, RESOURCE_HEALTH);
+               float align = GetResource(this, RES_HEALTH);
                string msg;
                vector msg_pos;
 
@@ -444,8 +443,7 @@ CLASS(DebugText3d, Object)
                        if (align > 0)
                                msg_pos.x -= stringwidth(msg, true, size * '1 1 0') * min(1, align);
 
-                       vector rgb = '1 1 0';
-                       drawcolorcodedstring2_builtin(msg_pos, msg, size * '1 1 0', rgb, alpha_, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring_builtin(msg_pos, msg, size * '1 1 0', alpha_, DRAWFLAG_NORMAL);
                }
        }
        ATTRIB(DebugText3d, draw2d, void(DebugText3d), DebugText3d_draw2d);