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

Move function to the file associated with the header that declares it.

Browse Source 
outd_move_to_first_town_entrance probably should have been in actions anyway.
This commit is contained in:
Celtic Minstrel
2025-03-08 20:43:39 -05:00
parent 5cfc6ba328
commit ea7c17d65e
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/boe.actions.cpp
View File

@@ -3613,6 +3613,33 @@ static void run_waterfalls(short mode){ // mode 0 - town, 1 - outdoors
}
}
void outd_move_to_first_town_entrance(int town) {
// Try to put the party in an outdoor section from which you can enter the town --
// so when you leave, you'll hopefully be in the right place.
auto town_entrances = univ.scenario.find_town_entrances(town);
if(!town_entrances.empty()){
// When there are multiple entrances, this part of the code shouldn't matter,
// but also won't hurt.
town_entrance_t first_entrance_found = town_entrances[0];
int x = first_entrance_found.out_sec.x;
int y = first_entrance_found.out_sec.y;
// Very janky but I don't know how else to make it properly load the right sections and set i_w_c
while(univ.party.outdoor_corner.x > x){
shift_universe_left();
}
while(univ.party.outdoor_corner.x < x){
shift_universe_right();
}
while(univ.party.outdoor_corner.y > y){
shift_universe_up();
}
while(univ.party.outdoor_corner.y < y){
shift_universe_down();
}
outd_move_party(local_to_global(first_entrance_found.loc), true);
}
}
bool outd_move_party(location destination,bool forced) {
location real_dest, sector_p_in;
bool keep_going = true,check_f;

27
src/game/boe.main.cpp
View File

@@ -425,33 +425,6 @@ static void process_args(int argc, char* argv[]) {
}
}
void outd_move_to_first_town_entrance(int town) {
// Try to put the party in an outdoor section from which you can enter the town --
// so when you leave, you'll hopefully be in the right place.
auto town_entrances = univ.scenario.find_town_entrances(town);
if(!town_entrances.empty()){
// When there are multiple entrances, this part of the code shouldn't matter,
// but also won't hurt.
town_entrance_t first_entrance_found = town_entrances[0];
int x = first_entrance_found.out_sec.x;
int y = first_entrance_found.out_sec.y;
// Very janky but I don't know how else to make it properly load the right sections and set i_w_c
while(univ.party.outdoor_corner.x > x){
shift_universe_left();
}
while(univ.party.outdoor_corner.x < x){
shift_universe_right();
}
while(univ.party.outdoor_corner.y > y){
shift_universe_up();
}
while(univ.party.outdoor_corner.y < y){
shift_universe_down();
}
outd_move_party(local_to_global(first_entrance_found.loc), true);
}
}
static void handle_scenario_args() {
bool resetting = false;
if(scen_arg_path){