diff -r 7206058a7e82 -r 2ed0eb408229 gfx.c --- a/gfx.c Sun Nov 13 13:43:55 2005 +0000 +++ b/gfx.c Sun Nov 13 14:54:09 2005 +0000 @@ -434,7 +434,7 @@ { char buffer[512]; uint32 tmp; - int num, w, mt, t; + int num, w, mt; const char *src; byte c; @@ -442,12 +442,11 @@ tmp = FormatStringLinebreaks(buffer, maxw); num = (uint16)tmp; - t = tmp >> 16; - mt = 10; - if (t != 0) { - mt = 6; - if (t != 244) mt = 18; + switch (GB(tmp, 16, 16)) { + case 0: mt = 10; break; + case 244: mt = 6; break; + default: mt = 18; break; } y -= (mt >> 1) * num; @@ -481,7 +480,7 @@ { char buffer[512]; uint32 tmp; - int num, w, mt, t; + int num, w, mt; const char *src; byte c; @@ -489,11 +488,11 @@ tmp = FormatStringLinebreaks(buffer, maxw); num = (uint16)tmp; - t = tmp >> 16; - mt = 10; - if (t != 0) { - mt = 6; - if (t != 244) mt = 18; + + switch (GB(tmp, 16, 16)) { + case 0: mt = 10; break; + case 244: mt = 6; break; + default: mt = 18; break; } src = buffer;