about summary refs log tree commit diff
path: root/src/engine/client
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-11 05:29:51 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-11 05:29:51 +0000
commit1d98b33ec21827aab21a5afef27c8abf6c510507 (patch)
treea0b68f64bd856242833ffcd9265ee091ba53bd58 /src/engine/client
parent6c60f3bcbb8d6c5afd2ef815f8a6307336a86f3d (diff)
downloadzcatch-1d98b33ec21827aab21a5afef27c8abf6c510507.tar.gz
zcatch-1d98b33ec21827aab21a5afef27c8abf6c510507.zip
added motd
Diffstat (limited to 'src/engine/client')
-rw-r--r--src/engine/client/ec_gfx.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/engine/client/ec_gfx.c b/src/engine/client/ec_gfx.c
index 7c02a39f..d7a0733a 100644
--- a/src/engine/client/ec_gfx.c
+++ b/src/engine/client/ec_gfx.c
@@ -944,8 +944,8 @@ float gfx_text_raw(void *font_set_v, float x, float y, float size, const char *t
     FONT *font;
     int actual_size;
     int i;
-    float draw_x;
-
+    float draw_x, draw_y;
+    
     /* to correct coords, convert to screen coords, round, and convert back */
     int actual_x = x * fake_to_screen_x;
     int actual_y = y * fake_to_screen_y;
@@ -969,6 +969,7 @@ float gfx_text_raw(void *font_set_v, float x, float y, float size, const char *t
         const unsigned char *c = (unsigned char *)text;
         int to_render = length;
         draw_x = x;
+        draw_y = y;
 
         if (i == 0)
             gfx_texture_set(font->outline_texture);
@@ -988,12 +989,20 @@ float gfx_text_raw(void *font_set_v, float x, float y, float size, const char *t
             float x_offset, y_offset, x_advance;
 
             float advance;
+            
+            if(*c == '\n')
+            {
+            	draw_x = x;
+            	draw_y += size; /* is this correct? -kma */
+            	c++;
+            	continue;
+			}
 
             font_character_info(font, *c, &tex_x0, &tex_y0, &tex_x1, &tex_y1, &width, &height, &x_offset, &y_offset, &x_advance);
 
             gfx_quads_setsubset(tex_x0, tex_y0, tex_x1, tex_y1);
 
-            gfx_quads_drawTL(draw_x+x_offset*size, y+y_offset*size, width*size, height*size);
+            gfx_quads_drawTL(draw_x+x_offset*size, draw_y+y_offset*size, width*size, height*size);
 
             advance = x_advance + font_kerning(font, *c, *(c+1));