diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2009-06-13 08:25:50 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2009-06-13 08:25:50 +0000 |
| commit | c2f8d0e07ac19d4a876444d045a4f199f4d7c4d7 (patch) | |
| tree | a4b1502e8b681868e6beec080494522eabc2c1bf /src | |
| parent | 69511102de9b0f3ec6ad555baf2a01d9ee1c3dfd (diff) | |
| download | zcatch-c2f8d0e07ac19d4a876444d045a4f199f4d7c4d7.tar.gz zcatch-c2f8d0e07ac19d4a876444d045a4f199f4d7c4d7.zip | |
minor cleanup of out commented clode
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/client/ec_gfx_text.c | 12 | ||||
| -rw-r--r-- | src/game/client/gameclient.cpp | 31 |
2 files changed, 0 insertions, 43 deletions
diff --git a/src/engine/client/ec_gfx_text.c b/src/engine/client/ec_gfx_text.c index a38e800b..de40e391 100644 --- a/src/engine/client/ec_gfx_text.c +++ b/src/engine/client/ec_gfx_text.c @@ -306,8 +306,6 @@ static void font_upload_glyph(FONTSIZEDATA *sizedata, int texnum, int slot_id, i sizedata->texture_width/sizedata->num_x_chars, sizedata->texture_height/sizedata->num_y_chars, font_texture_format, GL_UNSIGNED_BYTE, data); - - //dbg_msg("font", "uploaded %d at %d (%d %d)", chr, slot_id, x, y); } /* 8k of data used for rendering glyphs */ @@ -544,7 +542,6 @@ void gfx_text_ex(TEXT_CURSOR *cursor, const char *text, int length) { const char *current = (char *)text; const char *end = current+length; - //int to_render = length; draw_x = cursor_x; draw_y = cursor_y; @@ -567,7 +564,6 @@ void gfx_text_ex(TEXT_CURSOR *cursor, const char *text, int length) while(current < end) { int new_line = 0; - //int this_batch = (int)(end-current); const char *batch_end = end; if(cursor->line_width > 0 && !(cursor->flags&TEXTFLAG_STOP_AT_END)) { @@ -603,15 +599,8 @@ void gfx_text_ex(TEXT_CURSOR *cursor, const char *text, int length) } batch_end = current + wlen; - //this_batch = wlen; } - /*if((const char *)current+this_batch > end) - this_batch = (const char *)end-(const char *)current; - - end = */ - /*to_render -= this_batch;*/ - while(current < batch_end) { const char *tmp; @@ -656,7 +645,6 @@ void gfx_text_ex(TEXT_CURSOR *cursor, const char *text, int length) draw_x += advance*size; cursor->charcount++; - /* current++; */ } if(new_line) diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index 70aee255..ae501fa2 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -183,39 +183,8 @@ void GAMECLIENT::on_console_init() suppress_events = false; } -/* -unsigned char utf8lut[] = {} - -static int utf8_decode(unsigned char **ptr) -{ - unsigned char first = **ptr; - if(first&0x80 == 0) - { - *ptr += 1; - return first; - } - - if(first&(0x80|0x40|0x20) == (0x80|0x40)) - { - // two bytes - } - - if(first&(0x80|0x40|0x20|0x10) == (0x80|0x40|0x20)) - { - // three bytes - } -}*/ - -#include <stdio.h> - void GAMECLIENT::on_init() { - /*const char *p = "Hello World åäö ようこそ - ガイド "; - for(; *p; ) - { - dbg_msg("", "%d", utf8_decode(&p)); - }*/ - // init all components for(int i = 0; i < all.num; i++) all.components[i]->on_init(); |