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

Integrate some scenario strings

This commit is contained in:
Ted John 2016-09-04 14:58:04 +01:00
parent d9274ffd82
commit 8993328232
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/addresses.h
View File

@ -228,9 +228,6 @@
#define RCT2_ADDRESS_PARK_RATING_WARNING_DAYS 0x0135883E
#define RCT2_ADDRESS_SCENARIO_NAME 0x0135920A
#define RCT2_ADDRESS_SCENARIO_DETAILS 0x0135924A
#define RCT2_ADDRESS_PARK_ENTRANCE_X 0x01359350
#define RCT2_ADDRESS_PARK_ENTRANCE_Y 0x01359358
#define RCT2_ADDRESS_PARK_ENTRANCE_Z 0x01359360
@ -248,7 +245,6 @@
#define RCT2_ADDRESS_SAVED_VIEW_Y 0x0138869C
#define RCT2_ADDRESS_SAVED_VIEW_ZOOM 0x0138869E
#define RCT2_ADDRESS_SAVED_VIEW_ROTATION 0x0138869F
#define RCT2_ADDRESS_SCENARIO_COMPLETED_BY 0x013587D8
#define RCT2_ADDRESS_RIDE_MEASUREMENTS 0x0138B60C
#define RCT2_ADDRESS_GRASS_SCENERY_TILEPOS 0x013B0E70
@ -588,6 +584,9 @@
#define RCT2_ADDRESS_PARK_SIZE 0x013580EA
#define RCT2_ADDRESS_LAND_COST 0x01358770
#define RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST 0x01358772
#define RCT2_ADDRESS_SCENARIO_COMPLETED_BY 0x013587D8
#define RCT2_ADDRESS_SCENARIO_NAME 0x0135920A
#define RCT2_ADDRESS_SCENARIO_DETAILS 0x0135924A
#define RCT2_ADDRESS_NUM_MAP_ANIMATIONS 0x0138B580
#define RCT2_ADDRESS_CLIMATE 0x013CA746

4
src/management/finance.c
View File

@ -202,9 +202,7 @@ void finance_init() {
gScenarioCompletedCompanyValue = MONEY32_UNDEFINED;
gTotalAdmissions = 0;
gTotalIncomeFromAdmissions = 0;
RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_COMPLETED_BY, uint16) = 0x3F;
strcpy(gScenarioCompletedBy, "?");
finance_update_loan_hash();
}

8
src/scenario.c
View File

@ -59,9 +59,9 @@ static char _scenarioPath[MAX_PATH];
const char *_scenarioFileName = "";
rct_s6_info *gS6Info = RCT2_ADDRESS(0x0141F570, rct_s6_info);
char *gScenarioName = RCT2_ADDRESS(RCT2_ADDRESS_SCENARIO_NAME, char);
char *gScenarioDetails = RCT2_ADDRESS(RCT2_ADDRESS_SCENARIO_DETAILS, char);
char *gScenarioCompletedBy = RCT2_ADDRESS(RCT2_ADDRESS_SCENARIO_COMPLETED_BY, char);
char gScenarioName[64];
char gScenarioDetails[256];
char gScenarioCompletedBy[32];
char gScenarioSavePath[MAX_PATH];
int gFirstTimeSave = 1;
uint32 gLastAutoSaveTick = 0;
@ -259,7 +259,7 @@ void scenario_begin()
gScenarioCompletedCompanyValue = MONEY32_UNDEFINED;
gTotalAdmissions = 0;
gTotalIncomeFromAdmissions = 0;
RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_COMPLETED_BY, uint16) = 63;
strcpy(gScenarioCompletedBy, "?");
finance_update_loan_hash();
park_reset_history();
finance_reset_history();

6
src/scenario.h
View File

@ -436,9 +436,9 @@ extern int gScenarioListCapacity;
extern scenario_index_entry *gScenarioList;
extern rct_s6_info *gS6Info;
extern char *gScenarioName;
extern char *gScenarioDetails;
extern char *gScenarioCompletedBy;
extern char gScenarioName[64];
extern char gScenarioDetails[256];
extern char gScenarioCompletedBy[32];
extern char gScenarioSavePath[MAX_PATH];
extern int gFirstTimeSave;
extern uint32 gLastAutoSaveTick;