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

Merge pull request #1091 from duncanspumpkin/scenario_bugs 

Fix scenario bugs.
This commit is contained in:
Ted John 2015-05-18 22:28:16 +01:00
parent fec6584961 5180c247d6
commit cca1933318
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/management/research.c
View File

@ -278,17 +278,17 @@ void sub_684AC3(){
for (; research->entryIndex != -3; research += 2){
if (scenario_rand() & 1) continue;
rct_research_item* edx;
rct_research_item* ebp;
for (rct_research_item* inner_research = gResearchItems; inner_research->entryIndex != -2; inner_research++){
rct_research_item* inner_research = gResearchItems;
do{
if (research->entryIndex == inner_research->entryIndex){
edx = inner_research;
}
if ((research + 1)->entryIndex == inner_research->entryIndex){
ebp = inner_research;
}
}
} while ((inner_research++)->entryIndex != -2);
edx->entryIndex = research->entryIndex;
ebp->entryIndex = (research + 1)->entryIndex;

4
src/scenario.c
View File

@ -854,8 +854,8 @@ int scenario_prepare_for_save()
s6Info->objective_type = RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_TYPE, uint8);
s6Info->objective_arg_1 = RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_YEAR, uint8);
s6Info->objective_arg_2 = RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_CURRENCY, uint8);
s6Info->objective_arg_3 = RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_NUM_GUESTS, uint8);
s6Info->objective_arg_2 = RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_CURRENCY, sint32);
s6Info->objective_arg_3 = RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_NUM_GUESTS, uint16);
scenario_prepare_rides_for_save();