Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / draw.qh

diff --git a/qcsrc/menu/draw.qh b/qcsrc/menu/draw.qh
index 7178628d8b2f6e093ecc1116e976e6343244266f..873ccb6df31e3695760db9b33002da2fe1a23665 100644 (file)
--- a/qcsrc/menu/draw.qh
+++ b/qcsrc/menu/draw.qh
@@ -1,14 +1,13 @@
+#ifndef DRAW_H
+#define DRAW_H
+
 // from the engine
 vector drawfontscale;
 #define draw_fontscale drawfontscale
-#define draw_fontscale_x drawfontscale_x
-#define draw_fontscale_y drawfontscale_y
-#define draw_fontscale_z drawfontscale_z
 
 vector draw_shift;
 vector draw_scale;
 float draw_alpha;
-vector draw_fontscale;
 
 void draw_reset(float cw, float ch, float ox, float oy);
 void draw_beginBoldFont();
@@ -27,6 +26,7 @@ void draw_Fill(vector theOrigin, vector theSize, vector theColor, float theAlpha
 void draw_Text(vector origin, string text, vector size, vector color, float alpha, float allowColorCodes);
 void draw_CenterText(vector origin, string text, vector size, vector color, float alpha, float allowColorCodes);
 float draw_TextWidth(string text, float allowColorCodes, vector size);
+float draw_CondensedFontFactor(string theText, float ICanHasKallerz, vector SizeThxBye, float maxWidth);
 string draw_TextShortenToWidth(string text, float maxWidth, float allowColorCodes, vector size);
 float draw_TextLengthUpToWidth(string text, float maxWidth, float allowColorCodes, vector size);
 
@@ -39,7 +39,6 @@ vector boxToGlobalSize(vector v, vector scale);
 vector globalToBox(vector v, vector shift, vector scale);
 vector globalToBoxSize(vector v, vector scale);
 
-float draw_NeedResizeNotify;
-
 float draw_TextWidth_WithColors(string s, vector size);
 float draw_TextWidth_WithoutColors(string s, vector size);
+#endif