Some refactoring

cvet · Apr 22, 2024 · 4548781 · 4548781
1 parent 6e51c41
commit 4548781
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 30 deletions.
diff --git a/Source/Common/EntityProperties.h b/Source/Common/EntityProperties.h
@@ -273,9 +273,7 @@ class CritterProperties : public EntityProperties
     ENTITY_PROPERTY(Protected, uint16, WorldX);
     ///@ ExportProperty
     ENTITY_PROPERTY(Protected, uint16, WorldY);
-    ///@ ExportProperty ReadOnly
-    ENTITY_PROPERTY(Protected, ident_t, GlobalMapLeaderId);
-    ///@ ExportProperty ReadOnly
+    ///@ ExportProperty ReadOnly Temporary
     ENTITY_PROPERTY(PrivateServer, uint, GlobalMapTripId);
     ///@ ExportProperty ReadOnly
     ENTITY_PROPERTY(PrivateServer, ident_t, LastMapId);
@@ -286,8 +284,6 @@ class CritterProperties : public EntityProperties
     ///@ ExportProperty ReadOnly
     ENTITY_PROPERTY(PrivateServer, hstring, LastLocationPid);
     ///@ ExportProperty ReadOnly
-    ENTITY_PROPERTY(PrivateServer, ident_t, LastGlobalMapLeaderId);
-    ///@ ExportProperty ReadOnly
     ENTITY_PROPERTY(PrivateServer, uint16, MapLeaveHexX);
     ///@ ExportProperty ReadOnly
     ENTITY_PROPERTY(PrivateServer, uint16, MapLeaveHexY);

diff --git a/Source/Scripting/ClientGlobalScriptMethods.cpp b/Source/Scripting/ClientGlobalScriptMethods.cpp
@@ -145,20 +145,17 @@
     }
 
     const auto* hex_cr1 = dynamic_cast<CritterHexView*>(cr1);
-    if (hex_cr1 == nullptr) {
-        throw ScriptException("Critter 1 is not on map");
-    }
-
     const auto* hex_cr2 = dynamic_cast<CritterHexView*>(cr2);
-    if (hex_cr2 == nullptr) {
-        throw ScriptException("Critter 2 is not on map");
-    }
 
-    if (hex_cr1->GetMap()->GetId() != hex_cr2->GetMap()->GetId()) {
-        throw ScriptException("Critters different maps");
+    if (hex_cr1 != nullptr && hex_cr2 != nullptr) {
+        return GeometryHelper::DistGame(hex_cr1->GetHexX(), hex_cr1->GetHexY(), hex_cr2->GetHexX(), hex_cr2->GetHexY());
+    }
+    else if (hex_cr1 == nullptr && hex_cr2 == nullptr) {
+        return 0;
+    }
+    else {
+        throw ScriptException("Critters unknown positions");
     }
-
-    return GeometryHelper::DistGame(hex_cr1->GetHexX(), hex_cr1->GetHexY(), hex_cr2->GetHexX(), hex_cr2->GetHexY());
 }
 
 ///# ...

diff --git a/Source/Scripting/ServerGlobalScriptMethods.cpp b/Source/Scripting/ServerGlobalScriptMethods.cpp
@@ -179,11 +179,21 @@
         throw ScriptException("Critter2 arg is null");
     }
     if (cr1->GetMapId() != cr2->GetMapId()) {
-        throw ScriptException("Differernt maps");
+        throw ScriptException("Critters different maps");
     }
 
-    const auto dist = GeometryHelper::DistGame(cr1->GetHexX(), cr1->GetHexY(), cr2->GetHexX(), cr2->GetHexY());
-    return static_cast<int>(dist);
+    if (!cr1->GetMapId()) {
+        if (cr1->GlobalMapGroup != cr2->GlobalMapGroup) {
+            throw ScriptException("Critters different group on global map");
+        }
+
+        return 0;
+    }
+    else {
+        const auto dist = GeometryHelper::DistGame(cr1->GetHexX(), cr1->GetHexY(), cr2->GetHexX(), cr2->GetHexY());
+
+        return dist;
+    }
 }
 
 ///# ...

diff --git a/Source/Server/MapManager.cpp b/Source/Server/MapManager.cpp
@@ -1568,11 +1568,8 @@ void MapManager::AddCrToMap(Critter* cr, Map* map, uint16 hx, uint16 hy, uint8 d
         const auto* global_cr = global_cr_id && global_cr_id != cr->GetId() ? _engine->CrMngr.GetCritter(global_cr_id) : nullptr;
 
         if (global_cr == nullptr || global_cr->GetMapId()) {
-            cr->SetGlobalMapLeaderId(cr->GetId());
             cr->SetGlobalMapTripId(cr->GetGlobalMapTripId() + 1);
 
-            cr->SetLastGlobalMapLeaderId(cr->GetId());
-
             cr->GlobalMapGroup = new vector<Critter*>();
             cr->GlobalMapGroup->push_back(cr);
         }
@@ -1581,11 +1578,8 @@ void MapManager::AddCrToMap(Critter* cr, Map* map, uint16 hx, uint16 hy, uint8 d
 
             cr->SetWorldX(global_cr->GetWorldX());
             cr->SetWorldY(global_cr->GetWorldY());
-            cr->SetGlobalMapLeaderId(global_cr_id);
             cr->SetGlobalMapTripId(global_cr->GetGlobalMapTripId());
 
-            cr->SetLastGlobalMapLeaderId(global_cr_id);
-
             for (auto* group_cr : *global_cr->GlobalMapGroup) {
                 group_cr->Send_AddCritter(cr);
             }
@@ -1640,10 +1634,7 @@ void MapManager::EraseCrFromMap(Critter* cr, Map* map)
         cr->GlobalMapGroup->erase(it);
 
         if (!cr->GlobalMapGroup->empty()) {
-            const auto* new_leader = *cr->GlobalMapGroup->begin();
             for (auto* group_cr : *cr->GlobalMapGroup) {
-                group_cr->SetGlobalMapLeaderId(new_leader->GetId());
-                group_cr->SetLastGlobalMapLeaderId(new_leader->GetId());
                 group_cr->Send_RemoveCritter(cr);
             }
         }
@@ -1652,8 +1643,6 @@ void MapManager::EraseCrFromMap(Critter* cr, Map* map)
         }
 
         cr->GlobalMapGroup = nullptr;
-        cr->SetGlobalMapLeaderId(ident_t {});
-        cr->SetLastGlobalMapLeaderId(ident_t {});
     }
 }