Make type-checking methods const and refactor spectators logic

Changed type-checking methods (e.g., isItem, isCreature) to be const across Thing and derived classes for better const-correctness. Refactored Map's getSpectatorsInRangeEx and getSpectatorsByPattern to use a helper for cleaning duplicate/new spectators. Updated Thing to make most property accessors const and improved code clarity. Replaced std::reverse with std::ranges::reverse in Tile::getCreatures.

Author: dudantas

src/client/creature.h

@@ -159,7 +159,7 @@ class Creature : public Thing
     bool isDead() { return m_healthPercent <= 0; }
     bool isFullHealth() { return m_healthPercent == 100; }
     bool canBeSeen() { return !isInvisible() || isPlayer(); }
-    bool isCreature() override { return true; }
+    bool isCreature() const override { return true; }
     bool isCovered() { return m_isCovered; }
 
     void setCovered(bool covered);
@@ -367,12 +367,12 @@ minHeight,
 class Npc final : public Creature
 {
 public:
-    bool isNpc() override { return true; }
+    bool isNpc() const override { return true; }
 };
 
 // @bindclass
 class Monster final : public Creature
 {
 public:
-    bool isMonster() override { return true; }
+    bool isMonster() const override { return true; }
 };

src/client/effect.h

@@ -33,7 +33,7 @@ class Effect final : public Thing
     void setId(uint32_t id) override;
     void setPosition(const Position& position, uint8_t stackPos = 0) override;
 
-    bool isEffect() override { return true; }
+    bool isEffect() const override { return true; }
     bool waitFor(const EffectPtr&);
 
     EffectPtr asEffect() { return static_self_cast<Effect>(); }

src/client/item.h

@@ -104,7 +104,7 @@ class Item final : public Thing
 
     ItemPtr clone();
     ItemPtr asItem() { return static_self_cast<Item>(); }
-    bool isItem() override { return true; }
+    bool isItem() const override { return true; }
 
     void updatePatterns();
     int calculateAnimationPhase();
@@ -143,7 +143,7 @@ class Item final : public Thing
 
     bool isHouseDoor() { return m_attribs.has(ATTR_HOUSEDOORID); }
     bool isDepot() { return m_attribs.has(ATTR_DEPOT_ID); }
-    bool isContainer() override { return m_attribs.has(ATTR_CONTAINER_ITEMS) || Thing::isContainer(); }
+    bool isContainer() const override { return m_attribs.has(ATTR_CONTAINER_ITEMS) || Thing::isContainer(); }
     bool isDoor() { return m_attribs.has(ATTR_HOUSEDOORID); }
     bool isTeleport() { return m_attribs.has(ATTR_TELE_DEST); }
 

src/client/localplayer.h

@@ -124,7 +124,7 @@ class LocalPlayer final : public Player
     bool isParalyzed() const { return (m_states & Otc::IconParalyze) == Otc::IconParalyze; }
 
     LocalPlayerPtr asLocalPlayer() { return static_self_cast<LocalPlayer>(); }
-    bool isLocalPlayer() override { return true; }
+    bool isLocalPlayer() const override { return true; }
 
     void onPositionChange(const Position& newPos, const Position& oldPos) override;
 

src/client/map.cpp

@@ -36,6 +36,22 @@
 #include <framework/core/graphicalapplication.h>
 #include <framework/ui/uiwidget.h>
 #include <queue>
+#include <unordered_set>
+
+namespace
+{
+void cleanNewSpectators(std::vector<CreaturePtr>& creatures, std::unordered_set<uint32_t>& seenIds, const std::size_t startIndex)
+{
+    auto it = creatures.begin() + startIndex;
+    while (it != creatures.end()) {
+        if (const auto& creature = *it; !creature || !seenIds.insert(creature->getId()).second) {
+            it = creatures.erase(it);
+            continue;
+        }
+        ++it;
+    }
+}
+}
 
 #ifdef FRAMEWORK_EDITOR
 #include "houses.h"
@@ -649,26 +665,23 @@ std::vector<CreaturePtr> Map::getSpectatorsInRangeEx(const Position& centerPos,
     const int startX = centerPos.x - minXRange;
     const int endX = centerPos.x + maxXRange;
 
-    for (int z = startZ; z <= endZ; ++z) {
+    const auto appendSpectatorsFromLayer = [&](const int z) {
         for (int y = startY; y <= endY; ++y) {
             for (int x = startX; x <= endX; ++x) {
-                if (const auto& tile = getTile(Position(x, y, z)); tile && tile->hasCreatures()) {
-                    const auto sizeBeforeAppend = creatures.size();
-
-                    tile->appendSpectators(creatures);
-
-                    auto it = creatures.begin() + sizeBeforeAppend;
-                    while (it != creatures.end()) {
-                        const auto& creature = *it;
-                        if (!creature || !seenIds.insert(creature->getId()).second) {
-                            it = creatures.erase(it);
-                            continue;
-                        }
-                        ++it;
-                    }
+                const auto tile = getTile(Position(x, y, z));
+                if (!tile || !tile->hasCreatures()) {
+                    continue;
                 }
+
+                const auto sizeBeforeAppend = creatures.size();
+                tile->appendSpectators(creatures);
+                cleanNewSpectators(creatures, seenIds, sizeBeforeAppend);
             }
         }
+    };
+
+    for (int z = startZ; z <= endZ; ++z) {
+        appendSpectatorsFromLayer(z);
     }
     return creatures;
 }
@@ -1490,26 +1503,20 @@ std::vector<CreaturePtr> Map::getSpectatorsByPattern(const Position& centerPos,
     seenIds.reserve(m_knownCreatures.size());
     for (int y = centerPos.y - height / 2, endy = centerPos.y + height / 2; y <= endy; ++y) {
         for (int x = centerPos.x - width / 2, endx = centerPos.x + width / 2; x <= endx; ++x) {
-            if (!finalPattern[p++]) {
+            const auto enabled = finalPattern[p];
+            ++p;
+            if (!enabled) {
                 continue;
             }
-            const TilePtr& tile = getTile(Position(x, y, centerPos.z));
+
+            const auto tile = getTile(Position(x, y, centerPos.z));
             if (!tile || !tile->hasCreatures()) {
                 continue;
             }
 
             const auto sizeBeforeAppend = creatures.size();
             tile->appendSpectators(creatures);
-
-            auto it = creatures.begin() + sizeBeforeAppend;
-            while (it != creatures.end()) {
-                const auto& creature = *it;
-                if (!creature || !seenIds.insert(creature->getId()).second) {
-                    it = creatures.erase(it);
-                    continue;
-                }
-                ++it;
-            }
+            cleanNewSpectators(creatures, seenIds, sizeBeforeAppend);
         }
     }
     return creatures;

src/client/missile.h

@@ -34,7 +34,7 @@ class Missile final : public Thing
     void setId(uint32_t id) override;
     void setPath(const Position& fromPosition, const Position& toPosition);
 
-    bool isMissile() override { return true; }
+    bool isMissile() const override { return true; }
 
     MissilePtr asMissile() { return static_self_cast<Missile>(); }
 

src/client/player.h

@@ -32,5 +32,5 @@ class Player : public Creature
     ~Player() override = default;
 
     PlayerPtr asPlayer() { return static_self_cast<Player>(); }
-    bool isPlayer() override { return true; }
+    bool isPlayer() const override { return true; }
 };