openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Combine town-shifting data into a single structure

Browse Source
This commit is contained in:
Celtic Minstrel
2015-02-06 16:56:17 -05:00
parent f609711e27
commit a14d3b5ff8
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/boe.town.cpp
View File

@@ -124,11 +124,11 @@ void start_town_mode(short which_town, short entry_dir) {
// Now adjust town number as necessary.
for(i = 0; i < 10; i++)
if(univ.scenario.town_to_add_to[i] >= 0 && univ.scenario.town_to_add_to[i] < 200 &&
town_number == univ.scenario.town_to_add_to[i] &&
univ.party.sd_legit(univ.scenario.flag_to_add_to_town[i][0],univ.scenario.flag_to_add_to_town[i][1])) {
if(univ.scenario.town_mods[i].spec >= 0 && univ.scenario.town_mods[i].spec < 200 &&
town_number == univ.scenario.town_mods[i].spec &&
univ.party.sd_legit(univ.scenario.town_mods[i].x,univ.scenario.town_mods[i].y)) {
former_town = town_number;
town_number += PSD[univ.scenario.flag_to_add_to_town[i][0]][univ.scenario.flag_to_add_to_town[i][1]];
town_number += PSD[univ.scenario.town_mods[i].x][univ.scenario.town_mods[i].y];
// Now update horses & boats
for(i = 0; i < univ.party.horses.size(); i++)
if((univ.party.horses[i].exists) && (univ.party.horses[i].which_town == former_town))