From 0a71b633c7c5d665a4e2575c13f274388f5bc45c Mon Sep 17 00:00:00 2001
From: Robert Jordan <jrob698@gmail.com>
Date: Tue, 19 May 2015 11:51:59 -0400
Subject: [PATCH] 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
zcmZWlJxc>Y5Pd7j<pTscw6RenkV09A*~?uT3k5r4D$6P4a!Fb{K?u<#T8YWo+9=vv
zS&9F^&OhOg5Z|6A>dDQ`y!Uo?=VN@M9&VMB1@PJ&J8R``16YJh4rKVh>;n!8GoEb%
zODH_995s3+Y#_ic4$#2~u5gcMyx|=ma8*eewXGUzPHBBw)H(z08$BpkpM|b_Mh^=~
za4aJoS<09ruX#12&nYAzZ!;2fVRI5Rf$jyK7X(byQxHQ3JPqm;XW*KZ?VZ5)yeTjm
zusUUaraA-E`3R|JDE|PK^Q}Z}272tvw`rT2eSIT#&qPY>{tIwE-&8Ahz9e#bpOn+v
zz`dA?-3$G6S1vcaj8&9T;eNNUgT9h8NJj>AZ5cw^?MQkfNEAh(V4X^<720EZW`@EW
zE=s(<heI6W5_folQlc`Va-xc&=B2+N6Z>k);-m=c{I*yLOa8HLB=MZEe#($%GW$pw
PpG_&GtRG6s{&)Ea*F>M6

delta 20
bcmZ3sh;iavMm8n}28K+(iEK(6BQpH}Jmdwj

diff --git a/resources/g2/2.png b/resources/g2/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..674702e55092ec51082459e13474089b1e29e82b
GIT binary patch
literal 352
zcmeAS@N?(olHy`uVBq!ia0vp^B0wy}!3HFwFZ>e#QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I
z13lB!R-;s)nv0$;jv*HQy_fb1HaQ5eJ~+$6%cFV7Nap~P&Os+0jb<Yr9^C^%It>>R
zQp+n&e=0s+ZEVhd{QI;-wv91Tfzfrr9LY9qTlT+PZY|2)(`j*S`nUJXA`*O59tSlV
z3MTxWCwqIJj)58z&yLUppCcdFmp&=j@og$skK}P*=FhYL*8Oo2kuc_!spC8lnP~HU
zv#hYQp~2xj(lvH{Q*O#|Y-s6;tSxerG&<HE*<fsP<t{&?q%h+;$73!HjJID)8L2VF
rH1~AgaIP-qHA)k6uAX41q*OoqV%ST@ikMiS=NLR){an^LB{Ts5hmLwL

literal 0
HcmV?d00001

diff --git a/resources/g2/3.png b/resources/g2/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..20432f67df0771919c1388f0001b63e0d0bbd87e
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ(0U`xw#m)s%jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCf`#@Q5sCVBk9p!i>lBSEK+1B}!Z)N`mv#O3D+9QW**oGxJLH@={9_O!N%&
zOjBEpQh{oGJY5_^B*K#!80)Ir{wJ^*F>vbD-TyD|ETnd^cE3cZ&=E$?rh<Pz3tCh<
z7=;=Vzkhut;3*)u_r6@u!zKe+i6#YxM+qE<7?vq8Gc!cD+U9!Ry|Ec+E`z75pUXO@
GgeCyNEkHN`

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!ia0vp^qCm{a!3HGnGN+dTDaPU;cPEB*=VV?2IV|apzK#qG
z8~eHcB(j237I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66
zdZwwZMyWtG>7Fi*AsWHS42*TvZT}P41Og7VF;95#==<OQjwY%(D+&b|CcoGh&lB#V
zC!M9j(!k;%^z-@QgOjFgSm@@&;K88sa9^CPjwh#dUc#5U>KzKIIkzM@m=ySYCJ32b
kv0!l!ThhYI$iu@>aYXR-hTO8dKr0zMUHx3vIVCg!0OT7=oB#j-

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!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9
zbN@+X1@buyJR*x382Ao@Fyrz36)8YLi4xa{lHmNblJdl&REC1Y%)Ao4ywnl}6Fmbx
p)6`a@RG=DOPZ!4!iSXnEAOLb%85p~a9|IW-44$rjF6*2UngB)VB)|Xw

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