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

add global macro for gTotalAdmissions, gTotalIncomeFromAdmissions

This commit is contained in:
Ted John 2016-05-09 21:05:17 +01:00
parent be2d1127f5
commit 3105d62d3b
8 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/management/finance.c
View File

@ -186,8 +186,8 @@ void finance_init() {
gParkValue = 0; gParkValue = 0;
gCompanyValue = 0; gCompanyValue = 0;
gScenarioCompletedCompanyValue = MONEY32_UNDEFINED; gScenarioCompletedCompanyValue = MONEY32_UNDEFINED;
RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, uint32) = 0; gTotalAdmissions = 0;
RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, uint32) = 0; gTotalIncomeFromAdmissions = 0;
RCT2_GLOBAL(0x013587D8, uint16) = 0x3F; RCT2_GLOBAL(0x013587D8, uint16) = 0x3F;

4
src/peep/peep.c
View File

@ -7044,13 +7044,13 @@ static int peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_m
return peep_return_to_center_of_tile(peep); return peep_return_to_center_of_tile(peep);
} }
RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, money32) += entranceFee; gTotalIncomeFromAdmissions += entranceFee;
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_PARK_ENTRANCE_TICKETS; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_PARK_ENTRANCE_TICKETS;
peep_spend_money(peep, &peep->paid_to_enter, entranceFee); peep_spend_money(peep, &peep->paid_to_enter, entranceFee);
peep->peep_flags |= PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY; peep->peep_flags |= PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY;
} }
RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, uint32)++; gTotalAdmissions++;
window_invalidate_by_number(WC_PARK_INFORMATION, 0); window_invalidate_by_number(WC_PARK_INFORMATION, 0);
peep->var_37 = 1; peep->var_37 = 1;

4
src/rct1/S4Importer.cpp
View File

@ -700,8 +700,8 @@ void S4Importer::ImportFinance()
} }
RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_EXPENDITURE, money32) = _s4.total_expenditure; RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_EXPENDITURE, money32) = _s4.total_expenditure;
RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, uint32) = _s4.num_admissions; gTotalAdmissions = _s4.num_admissions;
RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, money32) = _s4.admission_total_income; gTotalIncomeFromAdmissions = _s4.admission_total_income;
// TODO marketing campaigns not working // TODO marketing campaigns not working
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)

4
src/rct2/S6Exporter.cpp
View File

@ -342,8 +342,8 @@ void S6Exporter::Export()
memcpy(_s6.park_value_history, gParkValueHistory, sizeof(_s6.park_value_history)); memcpy(_s6.park_value_history, gParkValueHistory, sizeof(_s6.park_value_history));
_s6.completed_company_value = gScenarioCompletedCompanyValue; _s6.completed_company_value = gScenarioCompletedCompanyValue;
_s6.total_admissions = RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, money32); _s6.total_admissions = gTotalAdmissions;
_s6.income_from_admissions = RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, money32); _s6.income_from_admissions = gTotalIncomeFromAdmissions;
_s6.company_value = gCompanyValue; _s6.company_value = gCompanyValue;
memcpy(_s6.byte_01358750, RCT2_ADDRESS(0x01358750, uint8), sizeof(_s6.byte_01358750)); memcpy(_s6.byte_01358750, RCT2_ADDRESS(0x01358750, uint8), sizeof(_s6.byte_01358750));
memcpy(_s6.awards, gCurrentAwards, sizeof(_s6.awards)); memcpy(_s6.awards, gCurrentAwards, sizeof(_s6.awards));

4
src/rct2/S6Importer.cpp
View File

@ -274,8 +274,8 @@ void S6Importer::Import()
memcpy(gParkValueHistory, _s6.park_value_history, sizeof(_s6.park_value_history)); memcpy(gParkValueHistory, _s6.park_value_history, sizeof(_s6.park_value_history));
gScenarioCompletedCompanyValue = _s6.completed_company_value; gScenarioCompletedCompanyValue = _s6.completed_company_value;
RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, money32) = _s6.total_admissions; gTotalAdmissions = _s6.total_admissions;
RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, money32) = _s6.income_from_admissions; gTotalIncomeFromAdmissions = _s6.income_from_admissions;
gCompanyValue = _s6.company_value; gCompanyValue = _s6.company_value;
memcpy(RCT2_ADDRESS(0x01358750, uint8), _s6.byte_01358750, sizeof(_s6.byte_01358750)); memcpy(RCT2_ADDRESS(0x01358750, uint8), _s6.byte_01358750, sizeof(_s6.byte_01358750));
memcpy(gCurrentAwards, _s6.awards, sizeof(_s6.awards)); memcpy(gCurrentAwards, _s6.awards, sizeof(_s6.awards));

4
src/scenario.c
View File

@ -238,8 +238,8 @@ void scenario_begin()
RCT2_GLOBAL(0x01358334, money32) = 0; RCT2_GLOBAL(0x01358334, money32) = 0;
RCT2_GLOBAL(0x01358338, uint16) = 0; RCT2_GLOBAL(0x01358338, uint16) = 0;
gScenarioCompletedCompanyValue = MONEY32_UNDEFINED; gScenarioCompletedCompanyValue = MONEY32_UNDEFINED;
RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, uint32) = 0; gTotalAdmissions = 0;
RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, uint32) = 0; gTotalIncomeFromAdmissions = 0;
RCT2_GLOBAL(0x013587D8, uint16) = 63; RCT2_GLOBAL(0x013587D8, uint16) = 63;
finance_update_loan_hash(); finance_update_loan_hash();
park_reset_history(); park_reset_history();

4
src/windows/park.c
View File

@ -1486,7 +1486,7 @@ static void window_park_price_paint(rct_window *w, rct_drawpixelinfo *dpi)
x = w->x + window_park_price_widgets[WIDX_PAGE_BACKGROUND].left + 4; x = w->x + window_park_price_widgets[WIDX_PAGE_BACKGROUND].left + 4;
y = w->y + window_park_price_widgets[WIDX_PAGE_BACKGROUND].top + 30; y = w->y + window_park_price_widgets[WIDX_PAGE_BACKGROUND].top + 30;
gfx_draw_string_left(dpi, STR_INCOME_FROM_ADMISSIONS, (void*)RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, 0, x, y); gfx_draw_string_left(dpi, STR_INCOME_FROM_ADMISSIONS, &gTotalIncomeFromAdmissions, 0, x, y);
} }
#pragma endregion #pragma endregion
@ -1605,7 +1605,7 @@ static void window_park_stats_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Draw number of guests in park // Draw number of guests in park
gfx_draw_string_left(dpi, STR_GUESTS_IN_PARK_LABEL, &gNumGuestsInPark, 0, x, y); gfx_draw_string_left(dpi, STR_GUESTS_IN_PARK_LABEL, &gNumGuestsInPark, 0, x, y);
y += 10; y += 10;
gfx_draw_string_left(dpi, STR_TOTAL_ADMISSIONS, (void*)RCT2_ADDRESS_TOTAL_ADMISSIONS, 0, x, y); gfx_draw_string_left(dpi, STR_TOTAL_ADMISSIONS, &gTotalAdmissions, 0, x, y);
} }
#pragma endregion #pragma endregion

7
src/world/park.h
View File

@ -51,8 +51,11 @@ enum {
#define gParkRating RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PARK_RATING, uint16) #define gParkRating RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PARK_RATING, uint16)
#define gParkEntranceFee RCT2_GLOBAL(RCT2_ADDRESS_PARK_ENTRANCE_FEE, money16) #define gParkEntranceFee RCT2_GLOBAL(RCT2_ADDRESS_PARK_ENTRANCE_FEE, money16)
#define gParkValue RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PARK_VALUE, money32) #define gTotalAdmissions RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, uint32)
#define gCompanyValue RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_COMPANY_VALUE, money32) #define gTotalIncomeFromAdmissions RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, money32)
#define gParkValue RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PARK_VALUE, money32)
#define gCompanyValue RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_COMPANY_VALUE, money32)
#define gLandPrice RCT2_GLOBAL(RCT2_ADDRESS_LAND_COST, money16) #define gLandPrice RCT2_GLOBAL(RCT2_ADDRESS_LAND_COST, money16)
#define gConstructionRightsPrice RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST, money16) #define gConstructionRightsPrice RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST, money16)