mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean code in custom_currency.c 

To make it more OpenRCT coding style compliant
This commit is contained in:
Daniel Trujillo 2016-06-24 20:15:45 +02:00
parent b12e5443e9
commit 4a28f7f6aa
1 changed files with 188 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/windows/custom_currency.c
View File

@ -32,10 +32,9 @@ enum WINDOW_CUSTOM_CURRENCY_WIDGET_IDX {
};
rct_widget window_custom_currency_widgets[] = {
// TYPE COLOUR LEFT RIGHT TOP BOTTOM IMAGE TOOLTIP
{ WWT_FRAME, 0, 0, 399, 0, 99, 0x0FFFFFFFF, STR_NONE }, // panel / background
{ WWT_CAPTION, 0, 1, 398, 1, 14, STR_CUSTOM_CURRENCY_WINDOW_TITLE, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CLOSEBOX, 0, 387, 397, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
{ WWT_FRAME, 0, 0, 399, 0, 99, 0x0FFFFFFFF, STR_NONE },
{ WWT_CAPTION, 0, 1, 398, 1, 14, STR_CUSTOM_CURRENCY_WINDOW_TITLE, STR_WINDOW_TITLE_TIP },
{ WWT_CLOSEBOX, 0, 387, 397, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP },
{ WWT_SPINNER, 1, 100, 200, 30, 40, 5462, STR_NONE },
{ WWT_DROPDOWN_BUTTON, 1, 189, 199, 31, 35, STR_NUMERIC_UP, STR_NONE },
{ WWT_DROPDOWN_BUTTON, 1, 189, 199, 36, 40, STR_NUMERIC_DOWN, STR_NONE },
@ -124,7 +123,8 @@ void window_custom_currency_open()
*
* rct2: 0x006BB01B
*/
static void window_custom_currency_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) {
static void window_custom_currency_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
{
widget = &w->widgets[widgetIndex - 1];
switch (widgetIndex) {
@ -190,16 +190,19 @@ static void window_custom_currency_mousedown(int widgetIndex, rct_window*w, rct_
*
* rct2: 0x006BB076
*/
static void window_custom_currency_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) {
static void window_custom_currency_dropdown(rct_window *w, int widgetIndex, int dropdownIndex)
{
if (dropdownIndex == -1)
return;
if(widgetIndex == WIDX_AFFIX_DROPDOWN_BUTTON) {
if(dropdownIndex == 0) {
CurrencyDescriptors[CURRENCY_CUSTOM].affix_ascii = CurrencyDescriptors[CURRENCY_CUSTOM].affix_unicode = CURRENCY_PREFIX;
CurrencyDescriptors[CURRENCY_CUSTOM].affix_ascii = CURRENCY_PREFIX;
CurrencyDescriptors[CURRENCY_CUSTOM].affix_unicode = CURRENCY_PREFIX;
} else if(dropdownIndex == 1) {
CurrencyDescriptors[CURRENCY_CUSTOM].affix_ascii = CurrencyDescriptors[CURRENCY_CUSTOM].affix_unicode = CURRENCY_SUFFIX;
CurrencyDescriptors[CURRENCY_CUSTOM].affix_ascii = CURRENCY_SUFFIX;
CurrencyDescriptors[CURRENCY_CUSTOM].affix_unicode = CURRENCY_SUFFIX;
}
@ -211,16 +214,24 @@ static void window_custom_currency_dropdown(rct_window *w, int widgetIndex, int
}
}
static void window_custom_currency_text_input(struct rct_window *w, int windgetIndex, char *text) {
static void window_custom_currency_text_input(struct rct_window *w, int windgetIndex, char *text)
{
if(text != NULL) {
strncpy(CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode, text, CURRENCY_SYMBOL_MAX_SIZE);
strncpy(gConfigGeneral.custom_currency_symbol, CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode, CURRENCY_SYMBOL_MAX_SIZE);
strncpy(CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode,
text,
CURRENCY_SYMBOL_MAX_SIZE);
strncpy(gConfigGeneral.custom_currency_symbol,
CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode,
CURRENCY_SYMBOL_MAX_SIZE);
config_save_default();
invalidate_money_widgets();
}
}
static void invalidate_money_widgets() {
static void invalidate_money_widgets()
{
widget_invalidate_by_class(WC_BOTTOM_TOOLBAR, 2 /*WIDX_MONEY (not accesible)*/);
widget_invalidate_by_class(WC_CUSTOM_CURRENCY_CONFIG, WIDX_RATE);
}
@ -229,7 +240,8 @@ static void invalidate_money_widgets() {
*
* rct2: 0x0066D321
*/
static void window_custom_currency_paint(rct_window *w, rct_drawpixelinfo *dpi) {
static void window_custom_currency_paint(rct_window *w, rct_drawpixelinfo *dpi)
{
int x, y;
set_format_arg(0, sint32, 100);
@ -249,12 +261,26 @@ static void window_custom_currency_paint(rct_window *w, rct_drawpixelinfo *dpi)
gfx_draw_string_left(dpi, STR_CURRENCY_SYMBOL_TEXT, NULL, w->colours[1], x, y);
gfx_draw_string(dpi, CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode, w->colours[1], w->x + window_custom_currency_widgets[WIDX_SYMBOL_TEXT].left + 1, w->y + window_custom_currency_widgets[WIDX_SYMBOL_TEXT].top);
gfx_draw_string(dpi,
CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode,
w->colours[1],
w->x + window_custom_currency_widgets[WIDX_SYMBOL_TEXT].left + 1,
w->y + window_custom_currency_widgets[WIDX_SYMBOL_TEXT].top);
if(CurrencyDescriptors[CURRENCY_CUSTOM].affix_unicode == CURRENCY_PREFIX){
gfx_draw_string_left(dpi, STR_PREFIX, w, w->colours[1], w->x + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].left + 1, w->y + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].top);
gfx_draw_string_left(dpi,
STR_PREFIX,
w,
w->colours[1],
w->x + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].left + 1,
w->y + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].top);
} else {
gfx_draw_string_left(dpi, STR_SUFFIX, w, w->colours[1], w->x + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].left + 1, w->y + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].top);
gfx_draw_string_left(dpi,
STR_SUFFIX,
w,
w->colours[1],
w->x + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].left + 1,
w->y + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].top);
}
}