From 4eb8192549ba2d55cb28dfdfa9ac7605969c6d0e Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Sat, 26 Dec 2015 17:09:15 +0000 Subject: [PATCH] replace tutorial button with new multiplayer button tutorial button and multiplayer button can be enabled / disabled easily, window auto resizes etc. --- data/language/english_uk.txt | 1 + resources/g2/60.png | Bin 0 -> 2968 bytes src/localisation/string_ids.h | 2 ++ src/sprites.h | 1 + src/windows/title_menu.c | 59 +++++++++++++++++----------------- 5 files changed, 33 insertions(+), 30 deletions(-) create mode 100644 resources/g2/60.png diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 13bf2f8ae9..c03f3fa568 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -3926,6 +3926,7 @@ STR_5584 :SI STR_5585 :{SMALLFONT}{BLACK}Unlocks ride operation limits, allowing for things like {VELOCITY} lift hills STR_5586 :Automatically open shops and stalls STR_5587 :{SMALLFONT}{BLACK}When enabled, shops and stalls will be automatically opened after building them +STR_5588 :{SMALLFONT}{BLACK}Play with other players ##################### # Rides/attractions # diff --git a/resources/g2/60.png b/resources/g2/60.png new file mode 100644 index 0000000000000000000000000000000000000000..2b4369ea8a9a9aad804d46a001861e3d32e8cd9b GIT binary patch literal 2968 zcmXX|XIN8N6TUYIgqlR8Y77BFQ7{2<=_M3ds#3zzA}uH)E+T=Yh;k8W;!1=73J9o3 zKm|brq=&Lp>7uTHbSW-Pno_^8`~8@iGw+;vpJ(RGInRl=KKrX6-w{3l00hlUjcqyB znjDqr)!_<;(V6DJR42=@z>gn?%SsCM<)9D7_6EZJh=xM~F zC3C1;YjLQH<-a>q<7oCD9kHY=NNA(JNW5m?YGLv9P~XPrD_odMN4+B~*-eoS<0LrG z+KUX*-*+ex$1BEBPTaSNU??R-BnU}lt zCul2j_ZsC&Wbl)S06L2KvmE%6c6?GNv zmyf+XLVi5IVp@Ui=C_ZiiEJo52hWtGJ%*ILT!bZ~pckG<$- z^-daS$&VizJ3hn~_c@1#%i*;=>@T^Kskn?|%F0Qh5&E_o2PW{^b_E@&`r-0?{DS)YkF*{QK;m$=M?fK4aFSEQ6`djCkh; zv+ZY{kIKe}^SuUgd2=4Fo?rxiPRJBI$R5~Z(9&k)f4?`IQHp)B z+H!ddEt_HSS=|FfWZ?tGee7DIkDI2}`)6~f?oLh~!QCkvT=%9I7y>SeON~R7YR1Fz zJTK^WzmVBoq>9eDFwAyg{Yz?_9vj7#c+jH3O(}4VIJJlnn`n8XFWf9F=lNcw#sH{$ zg$k`Nb_akqZ|JoM`TJx@2ZFJrAp*Tnyt<&C$k!`frHo{p+-%cOiB^#R+N{UE=KHq1 zc0`?w2V$_?Fvs;sDsog((p^MTEGg&qVbCeS^F$7qXrJX69X(H)PJ-?1_&noo)5C{C zxU4mguYZDsnftJJn)eC2IZq5p9%p+T({P6D0Y+bEb?>lKgN1B}tAIJx7=?ShWl@<6 zWT(Mtj?#yumkC%tjr~g6(Pz<7)Pqb|+pNVdGB$ymF~{rKMdEs3C``WDsUm~S?-fQW zgcnsDdNP{$4?WSEbGZ@L!4m1F*Lm?H3BebUnHIXgmZKo^z0C4wT8oIX-N;;qA8ZPo&su?QHXR4&YJeC0CFSeb#RFx6qd+(+c&Kz)Ow7B*%a9af1ZC}aTCkr7BgDy z0&|tPOjS*W%X(j}d;*kZ7SOWljCRMz+4KjeIue5)XDZvxx`o8gGhql43*XqGsveejV2 zjVxLyPnpgLcYCO;-}>DJ3%lcgvu)3yy>Ve{t7GBz93^@mHm3_+) zB9EEXVlR10H5laHeRdMvtC(kf53Aury~W?Y9)WYGAx$75em-Vt-GfFWmFR#ew%Mc* z)szJ7Y8C%R{rsK3IRB82H1cd%$1>4+)e4CL5yNa?vLw@D>`0SLz*sJekH~ftczVGH zXh^xCxqRgpe*dwu2CT;1@y4b}K}5Nwb{L3om4RlT!KPp}2!?h7bzhwUw}Dy1+sWvM z90r>h@F_g87lF}LBMTDJyPKKmXHc1^pW}VxUO5{YZWLLh;7$nQb;vOMSPV=&Q8Hg* zhHdtg5A^!$cA>7-3tLtDqIc^NaYO2wn2(i;)*GJfubl6Sh#g#?#4U`{c~I$2_j6Cr~cBcel=Uq6Q{m zcdSS5rN||@c3c*MvO!O1tv>Zf_;j~${*=_LR244&TeW^(n!lHz3TFiF%p!BdltT-6 zRvI;Y>pq)m5Z_t0zolT;;`gTY`BLH^gfX%RpaJ!p_BL9U{*T0R)KM z2^#mn+)=pxQ=;D$Rfer{6L>A}$lm<+c>at`d()cLo)gH7N(Y2BPSS$NcY*5oeNyD= zEa{OgBPn9e)RW=qhAgH$MF|P9`+-{lihZ)kKkTVuQ|fW6w(8106F6xYVGM9gY}WMe zSBUa@A8u2yZ-ky^2YT4!53LWp(*(xwW~RojGeenabled_widgets = ( (1 << WIDX_START_NEW_GAME) | (1 << WIDX_CONTINUE_SAVED_GAME) | - (1 << WIDX_SHOW_TUTORIAL) | - (1 << WIDX_GAME_TOOLS) | - (1 << WIDX_MULTIPLAYER) +#ifndef DISABLE_NETWORK + (1 << WIDX_MULTIPLAYER) | +#endif + // Disable tutorial + // (1 << WIDX_SHOW_TUTORIAL) | + (1 << WIDX_GAME_TOOLS) ); - // Disable tutorial button - window->disabled_widgets = (1 << WIDX_SHOW_TUTORIAL); + int i = 0; + int x = 0; + for (rct_widget *widget = window->widgets; widget->type != WWT_LAST; widget++) { + if (widget_is_enabled(window, i)) { + widget->left = x; + widget->right = x + 81; -#if DISABLE_NETWORK - // Disable multiplayer - window->widgets[WIDX_MULTIPLAYER].type = WWT_EMPTY; -#endif + x += 82; + } else { + widget->type = WWT_EMPTY; + } + i++; + } + window->width = x; + window->x = (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, uint16) - window->width) / 2; window_init_scroll_widgets(window); } @@ -195,18 +206,6 @@ static void window_title_menu_cursor(rct_window *w, int widgetIndex, int x, int static void window_title_menu_paint(rct_window *w, rct_drawpixelinfo *dpi) { gfx_fill_rect(dpi, w->x, w->y, w->x + w->width - 1, w->y + 82 - 1, 0x2000000 | 51); - - rct_widget *multiplayerButtonWidget = &window_title_menu_widgets[WIDX_MULTIPLAYER]; - if (multiplayerButtonWidget->type != WWT_EMPTY) { - gfx_fill_rect( - dpi, - w->x + multiplayerButtonWidget->left, - w->y + multiplayerButtonWidget->top, - w->x + multiplayerButtonWidget->right, - w->y + multiplayerButtonWidget->bottom, - 0x2000000 | 51 - ); - } window_draw_widgets(w, dpi); }