From 0a71b633c7c5d665a4e2575c13f274388f5bc45c Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Tue, 19 May 2015 11:51:59 -0400 Subject: [PATCH 1/2] Added game speed button sprites Also added empty.png to resources to fill in g2 sprites reserved by other contributors. --- data/g2.dat | Bin 20113 -> 20774 bytes resources/g2/2.png | Bin 0 -> 352 bytes resources/g2/3.png | Bin 0 -> 219 bytes resources/g2/4.png | Bin 0 -> 246 bytes resources/g2/empty.png | Bin 0 -> 156 bytes src/sprites.h | 5 ++++- src/windows/top_toolbar.c | 19 +++++++++---------- 7 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 resources/g2/2.png create mode 100644 resources/g2/3.png create mode 100644 resources/g2/4.png create mode 100644 resources/g2/empty.png diff --git a/data/g2.dat b/data/g2.dat index 551a8d2ef6062ff3a9963a20da6a059985be9924..ce7d217b48656c328464e8872ed8150f21b63b4f 100644 GIT binary patch delta 678 zcmbO@mvPx5MmAOk28MG16WNs1GyNDCL>Pn^K!AmTfnmQt0|OfaCy2`c;+bt5;#rVX$CuV+do&V5ni3z_65IFT+)aR}B9cgcwyAO&FaR{TP`T_4Jy!^z>L5 z^vq54S~x)@D}$b;sfk`ICzxUb@k~wh+CW@W6FqhYJxeoFGZVdbPAG!|qyj9|0a62I zO=8fiw=gxeurM>x(}OW4Gw4~EnVMNxnwcONQyBEjO+ljOrlv54i5>$3NZbr0VQOM* z4rAysFid99GdD9eH8C|YMldFU3^6e^F)`NDGY83;80*z@fc#`?Vr-<>0rD4^#ST_z zYy@(>Iaq`Zq{`S3$KcG+$Qakm5SJ0x!Vs5{9@okcm!6&$SKr1EmzI{6633w3$`F^DngWteO#!J) ziECtx6Jk(duwd|INMfjD=wn#Su$_UCF^-WXj*&f%kt>doH?C12ZW74UxQsYtG#PA3 yMmoqUI60XyE!lvNA9*a29w(7BevL9R^{>~w zjd*x;4+!ZrTu4YQuQ>gw_;|IkIs5VN(-PS>#z+N5*9CJV+q7-j|8lvtD0fe%#kJ|* z-Y<(t@KJdj)MzM}@OPfUhxbU=*!4}hDZ{a$r6;ns$W7AdSbJoHvB{OY{EU*qjO!ea zxim1|el2CB#uU@s(|NN}= zRPgU-L5oTUqfkTQ_ph%6JOu>z-k0ln*km9p(WJoeD1qY;!!iYCW`^ii+g#7PH#Rdc PFfe$!`njxgN@xNA!7V^I literal 0 HcmV?d00001 diff --git a/resources/g2/4.png b/resources/g2/4.png new file mode 100644 index 0000000000000000000000000000000000000000..29118138d8c658dfb0fb77eb27194a10f6fe8a63 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0y~yU=U?sVBq9nV_;yo%bZ@uz`(#*9OUlAuNSwSibJR*x382Ao@Fyrz36)6l13=$=-5hcO-X(i=}MX3x0iJ5sN zdU>fO3MP66dZwwZMyU)84C$UOjv*Ss$qbBj)ouS1*aQL&wJ}e4@aX&B|BfcAIV%bU z7$(2i7ta&!q9>iD!qULvAoTP3;e(T=Y*^^##Nff8@^D|Atd1wAbY8-jy6PPYsyVkL tIG7apd?pB)U9n(s5L?p1%gDpSP;o@?^@iNCy9^8r44$rjF6*2UngHY*N}K=y literal 0 HcmV?d00001 diff --git a/resources/g2/empty.png b/resources/g2/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..205d3c50a4ebcfd04d966473a5b0de733b2eb422 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0y~yU|GZx^prw85kH?(j9#r z85lP9bN@+XWnf_7EbxddW?8K literal 0 HcmV?d00001 diff --git a/src/sprites.h b/src/sprites.h index 5da29d9ff7..6b30a0f6fb 100644 --- a/src/sprites.h +++ b/src/sprites.h @@ -348,7 +348,10 @@ enum { SPR_G2_BEGIN = 324288, SPR_G2_LOGO = SPR_G2_BEGIN + 0, - SPR_G2_TITLE = SPR_G2_BEGIN + 1 + SPR_G2_TITLE = SPR_G2_BEGIN + 1, + SPR_G2_FASTFORWARD = SPR_G2_BEGIN + 2, + SPR_G2_SPEED_ARROW = SPR_G2_BEGIN + 3, + SPR_G2_HYPER_ARROWS = SPR_G2_BEGIN + 4 }; #endif diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c index 1128961e02..7ad7199397 100644 --- a/src/windows/top_toolbar.c +++ b/src/windows/top_toolbar.c @@ -640,17 +640,16 @@ static void window_top_toolbar_paint() y = w->y + window_top_toolbar_widgets[WIDX_FASTFORWARD].top + 0; if (widget_is_pressed(w, WIDX_FASTFORWARD)) y++; - //imgId = 5229;//SPR_NEXT; - //gfx_draw_sprite(dpi, imgId, x - 1, y - 2, 0); - imgId = SPR_NEXT; - gfx_draw_sprite(dpi, imgId, x + 4, y, 0); + imgId = SPR_G2_FASTFORWARD; + gfx_draw_sprite(dpi, imgId, x + 6, y + 3, 0); - char speedStr[] = { FORMAT_MEDIUMFONT, FORMAT_OUTLINE, - (gGameSpeed >= 5 ? FORMAT_YELLOW : FORMAT_GREEN), - 175, (gGameSpeed >= 2 ? 175 : '\0'), (gGameSpeed >= 3 ? 175 : '\0'), (gGameSpeed >= 4 ? 175 : '\0'), '\0' - }; - format_string_raw(RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char), speedStr, NULL); - gfx_draw_string(dpi, speedStr, 0, x + 5, y + 14); + + for (int i = 0; i < gGameSpeed && gGameSpeed <= 4; i++) { + gfx_draw_sprite(dpi, SPR_G2_SPEED_ARROW, x + 5 + i * 5, y + 15, 0); + } + if (gGameSpeed == 8) { + gfx_draw_sprite(dpi, SPR_G2_HYPER_ARROWS, x + 5, y + 15, 0); + } } // Draw cheats button From d764927fe2edecd36ad31fa3dc525d17e23a7926 Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Tue, 19 May 2015 11:56:47 -0400 Subject: [PATCH 2/2] Changed "Ludicrous Speed" to "Hyper Speed" --- data/language/english_uk.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 213732544c..f8c6171eab 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -3479,7 +3479,7 @@ STR_5142 :Normal Speed STR_5143 :Quick Speed STR_5144 :Fast Speed STR_5145 :Turbo Speed -STR_5146 :Ludicrous Speed +STR_5146 :Hyper Speed STR_5147 :Show cheats button on toolbar STR_5148 :{SMALLFONT}{BLACK}Change the game speed STR_5149 :{SMALLFONT}{BLACK}Open the cheats window