1 files changed, 6 insertions, 8 deletions

@@ -3,6 +3,7 @@
 #include <wx/dcbuffer.h>
 #include <wx/dcgraph.h>
 
+#include <fmt/core.h>
 #include <sstream>
 
 #include "ap_state.h"
@@ -85,10 +86,8 @@ void SubwayMap::OnConnect() {
 
     if (!AP_IsSunwarpShuffle() && subway_item.sunwarp &&
         subway_item.sunwarp->type != SubwaySunwarpType::kFinal) {
-      std::ostringstream tag;
-      tag << "sunwarp" << subway_item.sunwarp->dots;
-
-      tagged[tag.str()].push_back(subway_item.id);
+      std::string tag = fmt::format("subway{}", subway_item.sunwarp->dots);
+      tagged[tag].push_back(subway_item.id);
     }
 
     if (!AP_IsPilgrimageEnabled() &&
@@ -100,8 +99,7 @@ void SubwayMap::OnConnect() {
 
   if (AP_IsSunwarpShuffle()) {
     for (const auto &[index, mapping] : AP_GetSunwarpMapping()) {
-      std::ostringstream tag;
-      tag << "sunwarp" << mapping.dots;
+      std::string tag = fmt::format("sunwarp{}", mapping.dots);
 
       SubwaySunwarp fromWarp;
       if (index < 6) {
@@ -121,8 +119,8 @@ void SubwayMap::OnConnect() {
         toWarp.type = SubwaySunwarpType::kExit;
       }
 
-      tagged[tag.str()].push_back(GD_GetSubwayItemForSunwarp(fromWarp));
-      tagged[tag.str()].push_back(GD_GetSubwayItemForSunwarp(toWarp));
+      tagged[tag].push_back(GD_GetSubwayItemForSunwarp(fromWarp));
+      tagged[tag].push_back(GD_GetSubwayItemForSunwarp(toWarp));
     }
   }