Fixed recursive issues with choice of map

gwdevhub · Aug 17, 2024 · eeb006a · eeb006a
1 parent 06b6ef7
commit eeb006a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/GuildWarsPartySearch.Bot/daily_quests.h b/GuildWarsPartySearch.Bot/daily_quests.h
@@ -17,6 +17,9 @@ namespace DailyQuests {
             if (nearest_outpost_id == 0) {
                 nearest_outpost_id = get_nearest_outpost_id(map_id);
             }
+            if (nearest_outpost_id == 0) {
+                nearest_outpost_id = map_id;
+            }
         }
     };
     DailyQuest zaishen_bounty_cycles[] = {

diff --git a/GuildWarsPartySearch.Bot/gw-helper.c b/GuildWarsPartySearch.Bot/gw-helper.c
@@ -342,7 +342,8 @@ static int travel_wait(int map_id, District district, uint16_t district_number)
         && (GetDistrictNumber() == district_number)) {
         return 0;
     }
-    Travel(map_id, district, district_number);
+    RedirectMap(map_id, district, district_number);
+    //Travel(map_id, district, district_number);
     return wait_map_loading(map_id, 20000);
 }
 

diff --git a/GuildWarsPartySearch.Bot/main.cpp b/GuildWarsPartySearch.Bot/main.cpp
@@ -773,7 +773,7 @@ static int main_bot(void* param)
             continue;
         }
         auto old_wanted_map_id = wanted_map_id;
-        wanted_map_id = get_original_map_id(calculate_map_to_visit(bot_configuration.map_id, &wanted_district));
+        wanted_map_id = get_original_map_id(calculate_map_to_visit(wanted_map_id, &wanted_district));
         if (old_wanted_map_id != wanted_map_id) {
             LogInfo("Wanted map id changed from %d to %d", old_wanted_map_id, wanted_map_id);
         }