git subrepo pull d2mapapi

subrepo: subdir: "d2mapapi" merged: "40f6bda" upstream: origin: "[email protected]:soarqin/d2mapapi_mod.git" branch: "master" commit: "40f6bda" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596"
soarqin · Dec 14, 2021 · 640286b · 640286b
1 parent d98521f
commit 640286b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/d2mapapi/.gitrepo b/d2mapapi/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = [email protected]:soarqin/d2mapapi_mod.git
 	branch = master
-	commit = d9532a262521c55be5504749643176d3c8cb85d4
-	parent = 4989d39dfda7c3f085d3a8a91320be98313df52f
+	commit = 40f6bda69b168cb2d4d0b6eb2c9a62c7c1972b88
+	parent = d98521fddd0d2e91eaef345ea84774348bb865ae
 	method = rebase
 	cmdver = 0.4.3
diff --git a/d2mapapi/httpd.cpp b/d2mapapi/httpd.cpp
@@ -89,8 +89,8 @@ int wmain(int argc, wchar_t *argv[]) {
         }
         auto key = uint64_t(seed) | (uint64_t(difficulty) << 32);
         auto &session = sessions[key];
-        sessionsOrder.emplace_back(key);
         if (!session) {
+            sessionsOrder.emplace_back(key);
             session = std::make_unique<d2mapapi::Session>();
             session->update(seed, difficulty);
             if (sessionsOrder.size() > SessionsCacheSize) {

diff --git a/d2mapapi/mapdata.cpp b/d2mapapi/mapdata.cpp
@@ -86,7 +86,7 @@ MapData::MapData(Act *act, unsigned int areaId) : CollisionMap(areaId) {
             if (side < 0) { continue; }
             bool bAddedNear = false;
             if (!pRoom2Near->pRoom1(d2Ver)) {
-                D2COMMON_AddRoomData(act, pRoom2Near->pLevel(d2Ver)->dwLevelNo(d2Ver), nearPosX, nearPosY, nullptr);
+                D2COMMON_AddRoomData(act, nearLevelNo, nearPosX, nearPosY, nullptr);
                 bAddedNear = true;
             }
             int sideStart = -1;
@@ -169,7 +169,7 @@ MapData::MapData(Act *act, unsigned int areaId) : CollisionMap(areaId) {
                 }
             }
             if (bAddedNear) {
-                D2COMMON_RemoveRoomData(act, pRoom2Near->pLevel(d2Ver)->dwLevelNo(d2Ver), nearPosX, nearPosY, nullptr);
+                D2COMMON_RemoveRoomData(act, nearLevelNo, nearPosX, nearPosY, nullptr);
             }
         }
 

diff --git a/d2mapapi/piped.cpp b/d2mapapi/piped.cpp
@@ -75,8 +75,8 @@ int wmain(int argc, wchar_t *argv[]) {
         }
         auto key = uint64_t(req.seed) | (uint64_t(req.difficulty) << 32);
         auto &session = sessions[key];
-        sessionsOrder.emplace_back(key);
         if (!session) {
+            sessionsOrder.emplace_back(key);
             session = std::make_unique<d2mapapi::Session>();
             session->update(req.seed, req.difficulty);
             if (sessionsOrder.size() > SessionsCacheSize) {