mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1075 from Gymnasiast/develop

Browse Source 
Extend the RCT1 colour scheme to the scenario select and start new campaign window
This commit is contained in:
Ted John
2015-05-17 13:45:12 +01:00
parent e7cbd8bca0 8d0ab82d65
commit 2fa9b1a5a0
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/language/english_uk.txt
View File

@@ -3471,3 +3471,5 @@ STR_5134 :{SMALLFONT}{BLACK}Adjust larger area of land rights
STR_5135 :{SMALLFONT}{BLACK}Buy land rights and construction rights
STR_5136 :Land rights
STR_5137 :Allow lift hill speeds up to {VELOCITY}
STR_5138 :{SMALLFONT}{WINDOW_COLOUR_2}{STRINGID}
STR_5139 :{WHITE}{STRINGID}

17
src/windows/new_campaign.c
View File

@@ -19,6 +19,7 @@
*****************************************************************************/
#include "../addresses.h"
#include "../config.h"
#include "../game.h"
#include "../localisation/localisation.h"
#include "../interface/widget.h"
@@ -154,9 +155,19 @@ void window_new_campaign_open(sint16 campaignType)
(1 << WIDX_WEEKS_INCREASE_BUTTON) |
(1 << WIDX_WEEKS_DECREASE_BUTTON);
window_init_scroll_widgets(w);
w->colours[0] = 19;
w->colours[1] = 19;
w->colours[2] = 19;
if(!gConfigInterface.rct1_colour_scheme)
{
w->colours[0] = 19;
w->colours[1] = 19;
w->colours[2] = 19;
}
else
{
w->colours[0] = 4;
w->colours[1] = 4;
w->colours[2] = 1;
}
window_new_campaign_widgets[WIDX_TITLE].image = STR_MARKETING_VOUCHERS_FOR_FREE_ENTRY_TO_THE_PARK + campaignType;

16
src/windows/title_scenarioselect.c
View File

@@ -19,6 +19,7 @@
*****************************************************************************/
#include "../addresses.h"
#include "../config.h"
#include "../audio/audio.h"
#include "../localisation/date.h"
#include "../localisation/localisation.h"
@@ -290,7 +291,7 @@ static void window_scenarioselect_invalidate()
static void window_scenarioselect_paint()
{
int i, x, y;
int i, x, y, format;
rct_window *w;
rct_drawpixelinfo *dpi;
rct_widget *widget;
@@ -300,6 +301,9 @@ static void window_scenarioselect_paint()
window_draw_widgets(w, dpi);
// Use small text for the tabs when the RCT1 colour scheme is selected.
format = (gConfigInterface.rct1_colour_scheme) ? 5138 : 1193;
// Text for each tab
for (i = 0; i < 5; i++) {
widget = &window_scenarioselect_widgets[WIDX_TAB1 + i];
@@ -309,7 +313,7 @@ static void window_scenarioselect_paint()
x = (widget->left + widget->right) / 2 + w->x;
y = (widget->top + widget->bottom) / 2 + w->y - 3;
RCT2_GLOBAL(0x013CE952 + 0, short) = STR_BEGINNER_PARKS + i;
gfx_draw_string_centred_wrapped(dpi, (void*)0x013CE952, x, y, 87, 1193, 10);
gfx_draw_string_centred_wrapped(dpi, (void*)0x013CE952, x, y, 87, format, 10);
}
// Return if no scenario highlighted
@@ -352,7 +356,7 @@ static void window_scenarioselect_paint()
static void window_scenarioselect_scrollpaint()
{
int i, y, colour, highlighted;
int i, y, colour, highlighted, highlighted_format, unhighlighted_format;
rct_window *w;
rct_drawpixelinfo *dpi;
rct_scenario_basic *scenario;
@@ -363,6 +367,10 @@ static void window_scenarioselect_scrollpaint()
colour = (colour << 24) | (colour << 16) | (colour << 8) | colour;
gfx_clear(dpi, colour);
// Use white text for the scenario names when the RCT1 colour scheme is selected
highlighted_format = gConfigInterface.rct1_colour_scheme ? 5139 : 1193;
unhighlighted_format = gConfigInterface.rct1_colour_scheme ? 5139 : 1191;
y = 0;
for (i = 0; i < gScenarioListCount; i++) {
scenario = &gScenarioList[i];
@@ -383,7 +391,7 @@ static void window_scenarioselect_scrollpaint()
// Draw scenario name
strcpy((char*)0x009BC677, scenario->name);
RCT2_GLOBAL(0x013CE952, short) = 3165;
gfx_draw_string_centred(dpi, highlighted ? 1193 : 1191, 210, y + 1, 0, (void*)0x013CE952);
gfx_draw_string_centred(dpi, highlighted ? highlighted_format : unhighlighted_format, 210, y + 1, 0, (void*)0x013CE952);
// Check if scenario is completed
if (scenario->flags & SCENARIO_FLAGS_COMPLETED) {