diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 1048e947cc..05b59cae2a 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -3677,3 +3677,4 @@ STR_5340 :Clearance height STR_5341 :Flags STR_5342 :Choose a map tile STR_5343 :Automatically place staff +STR_5344 :Changelog \ No newline at end of file diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj index a2a80e3f55..9295f82d6c 100644 --- a/projects/openrct2.vcxproj +++ b/projects/openrct2.vcxproj @@ -89,6 +89,7 @@ + diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters index 6e564fe509..fad60aeef3 100644 --- a/projects/openrct2.vcxproj.filters +++ b/projects/openrct2.vcxproj.filters @@ -477,6 +477,9 @@ Source\Windows + + Source\Windows + diff --git a/src/config.c b/src/config.c index 0629f8eb1e..03e80495ea 100644 --- a/src/config.c +++ b/src/config.c @@ -176,6 +176,7 @@ config_property_definition _generalDefinitions[] = { { offsetof(general_configuration, no_test_crashes), "no_test_crashes", CONFIG_VALUE_TYPE_BOOLEAN, false, NULL }, { offsetof(general_configuration, date_format), "date_format", CONFIG_VALUE_TYPE_UINT8, DATE_FORMAT_DMY, _dateFormatEnum }, { offsetof(general_configuration, auto_staff_placement), "auto_staff", CONFIG_VALUE_TYPE_BOOLEAN, false, NULL }, + { offsetof(general_configuration, last_run_version), "last_run_version", CONFIG_VALUE_TYPE_STRING, { .value_string = NULL }, NULL }, }; config_property_definition _interfaceDefinitions[] = { diff --git a/src/config.h b/src/config.h index fd74a1827d..50ab7e7c95 100644 --- a/src/config.h +++ b/src/config.h @@ -133,6 +133,7 @@ typedef struct { uint8 no_test_crashes; uint8 date_format; uint8 auto_staff_placement; + utf8string last_run_version; } general_configuration; typedef struct { diff --git a/src/interface/window.h b/src/interface/window.h index 09fda4f914..89f7d394ab 100644 --- a/src/interface/window.h +++ b/src/interface/window.h @@ -413,6 +413,7 @@ enum { WC_LAND_RIGHTS = 118, WC_THEMES = 119, WC_TILE_INSPECTOR = 120, + WC_CHANGELOG = 121, // Only used for colour schemes WC_STAFF = 220, @@ -579,6 +580,7 @@ void window_text_input_open(rct_window* call_w, int call_widget, rct_string_id t void window_text_input_raw_open(rct_window* call_w, int call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, int maxLength); rct_window *window_mapgen_open(); rct_window *window_loadsave_open(int type, char *defaultName); +rct_window *window_changelog_open(); void window_editor_main_open(); void window_editor_bottom_toolbar_open(); diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index e67b3fc24c..dbe071800c 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -1504,6 +1504,8 @@ enum { STR_TILE_INSPECTOR_FLAGS = 5341, STR_TILE_INSPECTOR_CHOOSE_MSG = 5342, + STR_CHANGELOG_TITLE = 5344, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 }; diff --git a/src/openrct2.c b/src/openrct2.c index fbba658757..c29b2dc45d 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -37,6 +37,8 @@ char gOpenRCT2StartupActionPath[512] = { 0 }; // This should probably be changed later and allow a custom selection of things to initialise like SDL_INIT bool gOpenRCT2Headless = false; +bool gOpenRCT2ShowChangelog; + /** If set, will end the OpenRCT2 game loop. Intentially private to this module so that the flag can not be set back to 0. */ int _finished; @@ -129,6 +131,10 @@ bool openrct2_initialise() } } + gOpenRCT2ShowChangelog = true; + if (gConfigGeneral.last_run_version != NULL && (strcmp(gConfigGeneral.last_run_version, OPENRCT2_VERSION) == 0)) + gOpenRCT2ShowChangelog = false; + gConfigGeneral.last_run_version = OPENRCT2_VERSION; config_save_default(); // TODO add configuration option to allow multiple instances diff --git a/src/openrct2.h b/src/openrct2.h index d2452d5389..f170527a72 100644 --- a/src/openrct2.h +++ b/src/openrct2.h @@ -33,6 +33,7 @@ enum { extern int gOpenRCT2StartupAction; extern char gOpenRCT2StartupActionPath[512]; extern bool gOpenRCT2Headless; +extern bool gOpenRCT2ShowChangelog; bool openrct2_initialise(); void openrct2_launch(); diff --git a/src/title.c b/src/title.c index f30d96d8cf..5b9a1939e4 100644 --- a/src/title.c +++ b/src/title.c @@ -33,6 +33,7 @@ #include "intro.h" #include "management/news_item.h" #include "management/research.h" +#include "openrct2.h" #include "ride/ride.h" #include "scenario.h" #include "world/climate.h" @@ -125,6 +126,9 @@ void title_load() gfx_invalidate_screen(); RCT2_GLOBAL(0x009DEA66, uint16) = 0; + if (gOpenRCT2ShowChangelog) + window_changelog_open(); + log_verbose("loading title finished"); } diff --git a/src/windows/changelog.c b/src/windows/changelog.c new file mode 100644 index 0000000000..051f65f0ca --- /dev/null +++ b/src/windows/changelog.c @@ -0,0 +1,277 @@ +#include "../addresses.h" +#include "../localisation/localisation.h" +#include "../interface/widget.h" +#include "../interface/window.h" +#include "../interface/viewport.h" +#include "../world/scenery.h" +#include "../world/map.h" +#include "../world/footpath.h" +#include "../util/util.h" + +enum { + WIDX_BACKGROUND, + WIDX_TITLE, + WIDX_CLOSE, + WIDX_CONTENT_PANEL, + WIDX_SCROLL +}; + +#define WW 500 +#define WH 400 +#define MIN_WW 300 +#define MIN_WH 200 + +rct_widget window_changelog_widgets[] = { + { WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0x0FFFFFFFF, STR_NONE }, // panel / background + { WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_CHANGELOG_TITLE, STR_WINDOW_TITLE_TIP }, // title bar + { WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button + { WWT_RESIZE, 1, 0, WW - 1, 14, WH - 1, 0x0FFFFFFFF, STR_NONE }, // content panel + { WWT_SCROLL, 1, 3, WW - 3, 16, WH - 15, 3, STR_NONE }, // scroll area + { WIDGETS_END }, +}; + +static void window_changelog_emptysub() { } +static void window_changelog_close(); +static void window_changelog_mouseup(); +static void window_changelog_resize(); +static void window_changelog_scrollgetsize(); +static void window_changelog_invalidate(); +static void window_changelog_paint(); +static void window_changelog_scrollpaint(); + +static void* window_changelog_events[] = { + window_changelog_close, + window_changelog_mouseup, + window_changelog_resize, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_scrollgetsize, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_emptysub, + window_changelog_invalidate, + window_changelog_paint, + window_changelog_scrollpaint +}; + +static bool window_changelog_read_file(); +static void window_changelog_dispose_file(); + +static char *_changelogText = NULL; +static long _changelogTextSize = 0; +static char **_changelogLines = NULL; +static int _changelogNumLines = 0; +static int _changelogLongestLineWidth = 0; + +rct_window *window_changelog_open() +{ + rct_window* window; + + window = window_bring_to_front_by_class(WC_CHANGELOG); + if (window != NULL) + return window; + + if (!window_changelog_read_file()) + return NULL; + + int screenWidth = RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, uint16); + int screenHeight = RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_HEIGHT, uint16); + + window = window_create_centred( + screenWidth * 4 / 5, + screenHeight * 4 / 5, + (uint32*)window_changelog_events, + WC_CHANGELOG, + 0x100 + ); + window->widgets = window_changelog_widgets; + window->enabled_widgets = (1 << WIDX_CLOSE); + + window_init_scroll_widgets(window); + window->colours[0] = 7; + window->colours[1] = 7; + window->colours[2] = 7; + window->flags |= WF_RESIZABLE; + window->min_width = MIN_WW; + window->min_height = MIN_WH; + window->max_width = MIN_WW; + window->max_height = MIN_WH; + return window; +} + +static void window_changelog_close() +{ + window_changelog_dispose_file(); +} + +static void window_changelog_mouseup() +{ + short widgetIndex; + rct_window *w; + + window_widget_get_registers(w, widgetIndex); + + switch (widgetIndex) { + case WIDX_CLOSE: + window_close(w); + break; + } +} + +static void window_changelog_resize() +{ + rct_window *w; + + window_get_register(w); + + int screenWidth = RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, uint16); + int screenHeight = RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_HEIGHT, uint16); + + w->max_width = (screenWidth * 4) / 5; + w->max_height = (screenHeight * 4) / 5; + + w->min_width = MIN_WW; + w->min_height = MIN_WH; + if (w->width < w->min_width) { + window_invalidate(w); + w->width = w->min_width; + } + if (w->height < w->min_height) { + window_invalidate(w); + w->height = w->min_height; + } +} + +static void window_changelog_scrollgetsize() +{ + rct_window *w; + int width, height; + window_get_register(w); + + width = _changelogLongestLineWidth + 4; + height = _changelogNumLines * 11; + + window_scrollsize_set_registers(width, height); +} + +static void window_changelog_invalidate() +{ + rct_window *w; + + window_get_register(w); + + window_changelog_widgets[WIDX_BACKGROUND].right = w->width - 1; + window_changelog_widgets[WIDX_BACKGROUND].bottom = w->height - 1; + window_changelog_widgets[WIDX_TITLE].right = w->width - 2; + window_changelog_widgets[WIDX_CLOSE].left = w->width - 13; + window_changelog_widgets[WIDX_CLOSE].right = w->width - 3; + window_changelog_widgets[WIDX_CONTENT_PANEL].right = w->width - 1; + window_changelog_widgets[WIDX_CONTENT_PANEL].bottom = w->height - 1; + window_changelog_widgets[WIDX_SCROLL].right = w->width - 3; + window_changelog_widgets[WIDX_SCROLL].bottom = w->height - 15; +} + +static void window_changelog_paint() +{ + rct_window *w; + rct_drawpixelinfo *dpi; + + window_paint_get_registers(w, dpi); + + window_draw_widgets(w, dpi); +} + +static void window_changelog_scrollpaint() +{ + rct_window *w; + rct_drawpixelinfo *dpi; + + window_paint_get_registers(w, dpi); + + uint16 *currentFontFlags = RCT2_ADDRESS(RCT2_ADDRESS_CURRENT_FONT_FLAGS, uint16); + sint16 *currentFontSpriteBase = RCT2_ADDRESS(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, sint16); + *currentFontFlags = 0; + *currentFontSpriteBase = 224; + gfx_draw_string(dpi, (char*)0x009C383D, 1, dpi->x, dpi->y); + + int x = 3; + int y = 3; + for (int i = 0; i < _changelogNumLines; i++) { + gfx_draw_string(dpi, _changelogLines[i], 254, x, y); + y += 11; + } +} + +static bool window_changelog_read_file() +{ + window_changelog_dispose_file(); + if (!readentirefile("changelog.txt", &_changelogText, &_changelogTextSize)) { + log_error("Unable to read changelog.txt"); + return false; + } + _changelogText = realloc(_changelogText, _changelogTextSize + 1); + _changelogText[_changelogTextSize++] = 0; + + char *start = _changelogText; + if (_changelogTextSize >= 3 && utf8_is_bom(_changelogText)) + start += 3; + + int changelogLinesCapacity = 8; + _changelogLines = malloc(changelogLinesCapacity * sizeof(char*)); + _changelogLines[0] = start; + _changelogNumLines = 1; + + char *ch = start; + while (*ch != 0) { + unsigned char c = *ch; + if (c == '\n') { + *ch = 0; + ch++; + _changelogNumLines++; + if (_changelogNumLines > changelogLinesCapacity) { + changelogLinesCapacity *= 2; + _changelogLines = realloc(_changelogLines, changelogLinesCapacity * sizeof(char*)); + } + _changelogLines[_changelogNumLines - 1] = ch; + } else if (c < 32 || c > 122) { + // A character that won't be drawn or change state. + *ch = FORMAT_OUTLINE_OFF; + } + + ch++; + } + + _changelogLines = realloc(_changelogLines, _changelogNumLines * sizeof(char*)); + + RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16) = 224; + _changelogLongestLineWidth = 0; + for (int i = 0; i < _changelogNumLines; i++) { + int width = gfx_get_string_width(_changelogLines[i]); + _changelogLongestLineWidth = max(width, _changelogLongestLineWidth); + } + return true; +} + +static void window_changelog_dispose_file() +{ + SafeFree(_changelogText); + SafeFree(_changelogLines); + _changelogTextSize = 0; + _changelogNumLines = 0; +} \ No newline at end of file