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

Add new map generation icons and make description wider

This commit is contained in:
Thomas 2015-06-02 16:52:00 +02:00
parent 137c8c190d
commit 857e104153
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/g2/12.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 497 B

BIN
resources/g2/13.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 443 B

3
src/sprites.h
View File

@ -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

15
src/windows/mapgen.c
View File

@ -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