From 857e10415319d30ff9ce99a593cd7563cf1b0561 Mon Sep 17 00:00:00 2001
From: Thomas <denhollander.thomas@gmail.com>
Date: Tue, 2 Jun 2015 16:52:00 +0200
Subject: [PATCH] Add new map generation icons and make description wider

---
 resources/g2/12.png  | Bin 0 -> 497 bytes
 resources/g2/13.png  | Bin 0 -> 443 bytes
 src/sprites.h        |   3 +++
 src/windows/mapgen.c |  15 +++++++++------
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 resources/g2/12.png
 create mode 100644 resources/g2/13.png

diff --git a/resources/g2/12.png b/resources/g2/12.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c2346466919bb6071c743402dee01a3975f07ce
GIT binary patch
literal 497
zcmV<N0S^9&P)<h;3K|Lk000e1NJLTq0018V000{Z0{{R3v*Dy20001HP)t-s0001U
zn?rYdFKcTbSAR2ut4mv36Gv|=V~;zBi#wCMQ#)TLN3SP0pBGO{3olO}Z--AWM<YKw
z02gNfM=uXMQ!67s7c(yaTR$HYQve$?6CXDlFGE9XQ!_Uo2TNl&7b7DhGc)bP!}$OJ
z00DGTPE!Ct=GbNc00B8kL_t(|0hLniQiCuMY?JgtO`G#Dxgcl=@Bfl6o!S`{8O<LU
zc5gq(9sYif#yWF6p746wfXO>g&KPGp)19Bb!@&Y|_F}KrUZb}^a0-Duk&l5QgV1#k
z%$aB714kC&p6P`dRG2)Ry>&J)CrQlgBUA7Mg*yS{5HhAgkRA%rQ_eBi%lQryJ}M9e
z%v?BzUO19nQ-;-;vnmK$R)L~xl!58i0(oCqC2ASLV8Js9+)#)daD>f+Ky@6;q`ej$
z$6E@7zQxPw4QT}WG8PDwv1mq3Z$A6y_q_U|plZ~LC`b_O;|I<2oZ*=%OKnLLTrfX>
z`M)yAkY$+als0cS=d`F!nCI>5U(%ESqvbXMlOnZFzb{a$sin5FVXZDT?X6&~t?uD#
n{N4GsPk?`2cKty({O5cC71J4rCsoZU00000NkvXXu0mjf(CEfZ

literal 0
HcmV?d00001

diff --git a/resources/g2/13.png b/resources/g2/13.png
new file mode 100644
index 0000000000000000000000000000000000000000..17b58d28c4b06a9fb6ed19f234dd9f89d95f1f3f
GIT binary patch
literal 443
zcmeAS@N?(olHy`uVBq!ia0vp^@<1%j!3-ofKU^XUqyhtcLR^9L@_hFB+w*s?o-D4c
z?44}B*xGve`uN3@>+OSsvxAK%+cWgnXHTE)UvAIPK0iL$TsohhzuaBBUtPUkTDm@5
zzCT&LKbSo`TRz`g++SO`AvgB{&``#bAirP+hi5m^K%69RcNc~ZR#^`qhqJ&VvY3H^
zTNs2H8D`Cq01C2~c>21s-)CduQ|I>*+}#fpdhF@q7@~20@1$7qCIz0hNHwo%iNfyx
z{>w{ACpA^=>TVXF^Zf2^{^eKZ^ErIm6LOu&`ETvZWx2PQX5W6bVE3xM_FWmwnyv3j
z?%VMfh_K|m{cx(l%FW=G;c-5-2huSXRa;h^D)17Mx@#82BKJt$sQvxj9Er<HD?cVw
z#5kK6nyzqe6#w4v(8Zwf!OM^b*TY`PZWrKQlFG;GW^K&f?A3f?gPQH_8HbjeMBh<N
z5}B~WVITjB!xz}}CS?}{ok)|Pa`?mPX?kix|IgYLG|2_e&UtV7D~E61oDPfA50%&*
g=IsdlT>RF){tma!$|djFf!<~CboFyt=akR{0Pu{W`Tzg`

literal 0
HcmV?d00001

diff --git a/src/sprites.h b/src/sprites.h
index 6c7c150c47..cfdd1c030e 100644
--- a/src/sprites.h
+++ b/src/sprites.h
@@ -361,6 +361,9 @@ enum {
 	SPR_G2_ZOOM_IN_DISABLED = SPR_G2_BEGIN + 9,
 	SPR_G2_ZOOM_OUT = SPR_G2_BEGIN + 10,
 	SPR_G2_ZOOM_OUT_DISABLED = SPR_G2_BEGIN + 11,
+
+	SPR_G2_TAB_TREE = SPR_G2_BEGIN + 12,
+	SPR_G2_TAB_PENCIL = SPR_G2_BEGIN + 13,
 };
 
 #endif
diff --git a/src/windows/mapgen.c b/src/windows/mapgen.c
index 7f272df135..ad4df0b0b4 100644
--- a/src/windows/mapgen.c
+++ b/src/windows/mapgen.c
@@ -140,7 +140,7 @@ static rct_widget window_mapgen_simplex_widgets[] = {
 
 	{ WWT_DROPDOWN_BUTTON,	1,	104,	198,	52,		63,		2694,					STR_NONE },
 
-	{ WWT_12,				1,	4,		141,	52,		63,		2685,					STR_NONE },
+	{ WWT_12,				1,	4,		198,	52,		63,		2685,					STR_NONE },
 
 	{ WWT_SPINNER,			1,	104,	198,	70,		81,		STR_NONE,				STR_NONE },
 	{ WWT_DROPDOWN_BUTTON,	1,	187,	197,	71,		75,		STR_NUMERIC_UP,			STR_NONE },
@@ -172,6 +172,9 @@ static rct_widget window_mapgen_simplex_widgets[] = {
 	{ WIDGETS_END },
 };
 
+const int window_mapgen_tab_animation_divisor[] = { 1, 1, 1 };
+const int window_mapgen_tab_animation_frames[] = { 1, 1, 1 };
+
 
 static rct_widget *window_mapgen_page_widgets[] = {
 	window_mapgen_base_widgets,
@@ -1086,10 +1089,8 @@ static void window_mapgen_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w,
 
 	if (!(w->disabled_widgets & (1LL << widgetIndex))) {
 		if (w->page == page) {
-			int frame = w->frame_no / 2;
-			if (page == WINDOW_MAPGEN_PAGE_BASE)
-				frame %= 8;
-			spriteIndex += frame;
+			int frame = w->frame_no / window_mapgen_tab_animation_divisor[w->page];
+			spriteIndex += (frame % window_mapgen_tab_animation_frames[w->page]);
 		}
 
 		gfx_draw_sprite(dpi, spriteIndex, w->x + w->widgets[widgetIndex].left, w->y + w->widgets[widgetIndex].top, 0);
@@ -1098,7 +1099,9 @@ static void window_mapgen_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w,
 
 static void window_mapgen_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w)
 {
-
+	window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_BASE, SPR_G2_TAB_LAND);
+	window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_RANDOM, SPR_G2_TAB_TREE);
+	window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_SIMPLEX, SPR_G2_TAB_PENCIL);
 }
 
 #pragma endregion
\ No newline at end of file