GetResourceAmount --> GetResource, SetResourceAmount --> SetResource

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

diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh
index b1dea6dcc431a84c1063d36f567047222c3d530c..a8a76e47182f9fa67f757ce8428cb9bed355e3d0 100644 (file)
--- a/qcsrc/common/debug.qh
+++ b/qcsrc/common/debug.qh
@@ -407,7 +407,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;
@@ -427,16 +427,25 @@ CLASS(DebugText3d, Object)
                        return;
                }
 
-               int size = 8;
+               int size = 11;
                vector screen_pos = project_3d_to_2d(this.origin) + since_created * this.velocity;
-               float align = GetResourceAmount(this, RESOURCE_HEALTH);
-               if (align > 0)
-                       screen_pos.x -= stringwidth(this.message, true, size * '1 1 0') * min(1, align);
                if (screen_pos.z < 0) return; // behind camera
+
                screen_pos.z = 0;
+               float align = GetResource(this, RES_HEALTH);
+               string msg;
+               vector msg_pos;
+
+               int n = tokenizebyseparator(this.message, "\n");
+               for(int k = 0; k < n; ++k)
+               {
+                       msg = argv(k);
+                       msg_pos = screen_pos + k * 1.25 * size * eY;
+                       if (align > 0)
+                               msg_pos.x -= stringwidth(msg, true, size * '1 1 0') * min(1, align);
 
-               vector rgb = '1 1 0';
-               drawcolorcodedstring2_builtin(screen_pos, this.message, 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);
 ENDCLASS(DebugText3d)