diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-25 11:56:11 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-25 11:56:11 +0000 |
| commit | 5050c0ca4f266c2bbfd5651f61256c6606253000 (patch) | |
| tree | 16553678c4369b62d9496d188483e07c49ded29d /src/engine | |
| parent | cd6d5e6237acf659d75fa64568506c152ce41ec9 (diff) | |
| download | zcatch-5050c0ca4f266c2bbfd5651f61256c6606253000.tar.gz zcatch-5050c0ca4f266c2bbfd5651f61256c6606253000.zip | |
compile fixes
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/client/ec_gfx.c | 18 | ||||
| -rw-r--r-- | src/engine/client/ec_ui.c | 1 | ||||
| -rw-r--r-- | src/engine/e_snapshot.c | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/engine/client/ec_gfx.c b/src/engine/client/ec_gfx.c index 83bfff17..e72fdfa7 100644 --- a/src/engine/client/ec_gfx.c +++ b/src/engine/client/ec_gfx.c @@ -899,22 +899,22 @@ float gfx_text_raw(void *font_set_v, float x, float y, float size, const char *t float fake_to_screen_y = (screen_height/(screen_y1-screen_y0)); FONT *font; + int actual_size; + int i; + float draw_x; - // to correct coords, convert to screen coords, round, and convert back + /* 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; x = actual_x / fake_to_screen_x; y = actual_y / fake_to_screen_y; - // same with size - int actual_size = size * fake_to_screen_y; + /* same with size */ + actual_size = size * fake_to_screen_y; size = actual_size / fake_to_screen_y; font = font_set_pick(font_set, actual_size); - int i; - float draw_x; - if (length < 0) length = strlen(text); @@ -1052,8 +1052,8 @@ float gfx_pretty_text_raw(float x, float y, float size, const char *text_, int l void gfx_pretty_text(float x, float y, float size, const char *text, int max_width) { - //gfx_text(gfx_font_set, x, y, 0.8*size, text, max_width); - //return; + /*gfx_text(gfx_font_set, x, y, 0.8*size, text, max_width); + return;*/ if(max_width == -1) gfx_pretty_text_raw(x, y, size, text, -1); else @@ -1078,7 +1078,7 @@ void gfx_pretty_text(float x, float y, float size, const char *text, int max_wid float gfx_pretty_text_width(float size, const char *text_, int length) { - //return gfx_text_width(gfx_font_set, 0.8*size, text_, length); + /*return gfx_text_width(gfx_font_set, 0.8*size, text_, length);*/ const float spacing = 0.05f; float w = 0.0f; diff --git a/src/engine/client/ec_ui.c b/src/engine/client/ec_ui.c index 50234a6b..5ba9c0d9 100644 --- a/src/engine/client/ec_ui.c +++ b/src/engine/client/ec_ui.c @@ -275,4 +275,3 @@ void ui_margin(const struct rect *original, int pixels, struct rect *other_rect) other_rect->w = r.w - 2*pixels; other_rect->h = r.h - 2*pixels; } - diff --git a/src/engine/e_snapshot.c b/src/engine/e_snapshot.c index 66b9a295..2957f1db 100644 --- a/src/engine/e_snapshot.c +++ b/src/engine/e_snapshot.c @@ -427,7 +427,7 @@ void snapstorage_purge_until(SNAPSTORAGE *ss, int tick) return; /* no more to remove */ mem_free(h); - // did we come to the end of the list? + /* did we come to the end of the list? */ if (!next) break; |