more small changes

This commit is contained in:
Duncan 2014-06-04 17:04:33 +01:00
parent 8b233c2f79
commit 55e8fe74ff
1 changed files with 2 additions and 4 deletions

View File

@ -1343,9 +1343,8 @@ int gfx_get_string_width(char* buffer)
break;
case 0x17:
g1_element = &(RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS, rct_g1_element)[*curr_char&0x7FFFF]);
width = g1_element.width; //RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS + 4, uint16)[(*curr_char & 0x7FFFF) << 4];
width += g1_element.width; //RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS + 4, uint16)[(*curr_char & 0x7FFFF) << 4];
curr_char += 4;
*curr_char = 0;
break;
default:
if (*curr_char <= 0x10) {
@ -1416,9 +1415,8 @@ int gfx_clip_string(char* buffer, int width)
*current_font_sprite_base = 0;
break;
case 0x17:
clipped_width = RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS + 4, uint16)[(*curr_char & 0x7FFFF) << 4];
clipped_width += RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS + 4, uint16)[(*curr_char & 0x7FFFF) << 4];
curr_char += 4;
*curr_char = 0;
continue;
default:
if (*curr_char <= 0x10) {