diff options
author | 2013-01-11 07:32:46 +0000 | |
---|---|---|
committer | 2013-01-11 07:32:46 +0000 | |
commit | 0e19f641d3186cdbf51f8ca857e2b07ab95779c2 (patch) | |
tree | 234109de1123b13f217494af4b3f8efad346d5cc /src/emu/ui.c | |
parent | 111157ca09a9ff60fe4a9ba49173c315e94314fa (diff) |
Cleanups and version bumpmame0148
Diffstat (limited to 'src/emu/ui.c')
-rw-r--r-- | src/emu/ui.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/src/emu/ui.c b/src/emu/ui.c index 22e99e50e5e..edc6f206ec0 100644 --- a/src/emu/ui.c +++ b/src/emu/ui.c @@ -197,19 +197,19 @@ INLINE int is_breakable_char(unicode_char ch) return TRUE; /* In the following character sets, any character is breakable: - Hiragana (3040-309F) - Katakana (30A0-30FF) - Bopomofo (3100-312F) - Hangul Compatibility Jamo (3130-318F) - Kanbun (3190-319F) - Bopomofo Extended (31A0-31BF) - CJK Strokes (31C0-31EF) - Katakana Phonetic Extensions (31F0-31FF) - Enclosed CJK Letters and Months (3200-32FF) - CJK Compatibility (3300-33FF) - CJK Unified Ideographs Extension A (3400-4DBF) - Yijing Hexagram Symbols (4DC0-4DFF) - CJK Unified Ideographs (4E00-9FFF) */ + Hiragana (3040-309F) + Katakana (30A0-30FF) + Bopomofo (3100-312F) + Hangul Compatibility Jamo (3130-318F) + Kanbun (3190-319F) + Bopomofo Extended (31A0-31BF) + CJK Strokes (31C0-31EF) + Katakana Phonetic Extensions (31F0-31FF) + Enclosed CJK Letters and Months (3200-32FF) + CJK Compatibility (3300-33FF) + CJK Unified Ideographs Extension A (3400-4DBF) + Yijing Hexagram Symbols (4DC0-4DFF) + CJK Unified Ideographs (4E00-9FFF) */ if (ch >= 0x3040 && ch <= 0x9fff) return TRUE; @@ -318,7 +318,7 @@ int ui_display_startup_screens(running_machine &machine, int first_time, int sho int state; /* disable everything if we are using -str for 300 or fewer seconds, or if we're the empty driver, - or if we are debugging */ + or if we are debugging */ if (!first_time || (str > 0 && str < 60*5) || &machine.system() == &GAME_NAME(___empty) || (machine.debug_flags & DEBUG_FLAG_ENABLED) != 0) show_gameinfo = show_warnings = show_disclaimer = FALSE; @@ -643,7 +643,7 @@ void ui_draw_text_full(render_container *container, const char *origs, float x, s += scharcount; /* if we hit any non-space breakable character, remember the location and width - *with* the breakable character */ + *with* the breakable character */ if (schar != ' ' && is_breakable_char(schar) && curwidth <= wrapwidth) { lastbreak = s; @@ -816,9 +816,9 @@ void ui_draw_text_box(render_container *container, const char *text, int justify /* add a box around that */ ui_draw_outlined_box(container, target_x - UI_BOX_LR_BORDER, - target_y - UI_BOX_TB_BORDER, - target_x + target_width + UI_BOX_LR_BORDER, - target_y + target_height + UI_BOX_TB_BORDER, backcolor); + target_y - UI_BOX_TB_BORDER, + target_x + target_width + UI_BOX_LR_BORDER, + target_y + target_height + UI_BOX_TB_BORDER, backcolor); ui_draw_text_full(container, text, target_x, target_y, target_width + 0.00001f, justify, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, NULL, NULL); } @@ -960,7 +960,7 @@ static astring &disclaimer_string(running_machine &machine, astring &string) static astring &warnings_string(running_machine &machine, astring &string) { -#define WARNING_FLAGS ( GAME_NOT_WORKING | \ +#define WARNING_FLAGS ( GAME_NOT_WORKING | \ GAME_UNEMULATED_PROTECTION | \ GAME_MECHANICAL | \ GAME_WRONG_COLORS | \ @@ -1036,13 +1036,13 @@ static astring &warnings_string(running_machine &machine, astring &string) string.cat("\nTHIS "); string.cat(emulator_info::get_capgamenoun()); string.cat(" DOESN'T WORK. The emulation for this game is not yet complete. " - "There is nothing you can do to fix this problem except wait for the developers to improve the emulation.\n"); + "There is nothing you can do to fix this problem except wait for the developers to improve the emulation.\n"); } if (machine.system().flags & GAME_MECHANICAL) { string.cat("\nCertain elements of this "); string.cat(emulator_info::get_gamenoun()); string.cat(" cannot be emulated as it requires actual physical interaction or consists of mechanical devices. " - "It is not possible to fully play this "); + "It is not possible to fully play this "); string.cat(emulator_info::get_gamenoun()); string.cat(".\n"); } @@ -2311,4 +2311,3 @@ void ui_set_use_natural_keyboard(running_machine &machine, int use_natural_keybo machine.options().set_value(OPTION_NATURAL_KEYBOARD, use_natural_keyboard, OPTION_PRIORITY_CMDLINE, error); assert(!error); } - |