Changeset 25279

Timestamp:

Apr 16, 2021, 6:04:01 PM (3 years ago)

Author:

wraitii

Message:

Improvements on rP25210

See rP25210. Follows comments by @vladislavbelov.

Differential Revision: ​https://code.wildfiregames.com/D3852

Location:

ps/trunk/source

Files:

• graphics/ObjectBase.cpp (modified) (7 diffs)
• ps/ConfigDB.cpp (modified) (1 diff)
• ps/ConfigDB.h (modified) (2 diffs)

ps/trunk/source/graphics/ObjectBase.cpp

@@ -32 +32 @@
 #include <boost/random/uniform_int_distribution.hpp>
 
-namespace {
-    int GetQuality(CStr& value)
-    {
-        if (value == "low")
-            return 100;
-        else if (value == "medium")
-            return 150;
-        else if (value == "high")
-            return 200;
-        else
-            return value.ToInt();
-    }
-}
+namespace
+{
+/**
+ * The maximal quality for an actor.
+ */
+static constexpr int MAX_QUALITY = 255;
+
+/**
+ * How many quality levels a given actor can have.
+ */
+static constexpr int MAX_LEVELS_PER_ACTOR_DEF = 5;
+
+int GetQuality(const CStr& value)
+{
+    if (value == "low")
+        return 100;
+    else if (value == "medium")
+        return 150;
+    else if (value == "high")
+        return 200;
+    else
+        return value.ToInt();
+}
+} // anonymous namespace
 
 CObjectBase::CObjectBase(CObjectManager& objectManager, CActorDef& actorDef, u8 qualityLevel)
@@ -762 +773 @@
             return base;
     // This code path ought to be impossible to take,
-    // because by construction we must have at least one valid CObjectBase of quality 255
+    // because by construction we must have at least one valid CObjectBase of quality 
     // (which necessarily fits the u8 comparison above).
     // However compilers will warn that we return a reference to a local temporary if I return nullptr,
@@ -807 +818 @@
     if (root.GetNodeName() == el_actor)
     {
-        std::unique_ptr<CObjectBase> base = std::make_unique<CObjectBase>(m_ObjectManager, *this, 255);
+        std::unique_ptr<CObjectBase> base = std::make_unique<CObjectBase>(m_ObjectManager, *this, );
         base->Load(XeroFile, root);
         m_ObjectBases.emplace_back(std::move(base));
@@ -841 +852 @@
                 {
                     int v = GetQuality(attr.Value);
-                    if (v > 255)
+                    if (v > )
                     {
-                        LOGERROR("Qualitylevel to attribute must not be above 255 (file %s)", pathname.string8());
+                        LOGERROR("Qualitylevel to attribute must not be above , pathname.string8());
                         return false;
                     }
@@ -864 +875 @@
             }
             if (!found_quality)
-                quality = 255;
+                quality = ;
             std::unique_ptr<CObjectBase> base = std::make_unique<CObjectBase>(m_ObjectManager, *this, quality);
             if (use_inline)
@@ -904 +915 @@
             m_ObjectBases.emplace_back(std::move(base));
         }
-        if (quality != 255)
-        {
-            LOGERROR("Quality levels must go up to 255 (file %s)", pathname.string8().c_str());
+        if (quality != )
+        {
+            LOGERROR("Quality levels must go up to , pathname.string8().c_str());
             return false;
         }
@@ -916 +927 @@
         base->GetQualitySplits(splits);
     ENSURE(splits.size() >= 1);
-    if (splits.size() > 5)
-    {
-        LOGERROR("Too many quality levels (%i) for actor %s", splits.size(), pathname.string8().c_str());
+    if (splits.size() > )
+    {
+        LOGERROR("Too many quality levels (%i) for actor %s);
         return false;
     }

ps/trunk/source/ps/ConfigDB.cpp

@@ -497 +497 @@
 void CConfigDB::UnregisterHook(CConfigDBHook&& hook)
 {
-    if (hook.ptr != m_Hooks.end())
-        m_Hooks.erase(hook.ptr);
-}
-
-void CConfigDB::UnregisterHook(std::unique_ptr<CConfigDBHook>&& hook)
+    if (hook.tr != m_Hooks.end())
+        m_Hooks.erase(hook.tr);
+}
+
+void CConfigDB::UnregisterHook(std::unique_ptr<CConfigDBHook> hook)
 {
     UnregisterHook(std::move(*hook.get()));

ps/trunk/source/ps/ConfigDB.h

@@ -183 +183 @@
 
     void UnregisterHook(CConfigDBHook&& hook);
-    void UnregisterHook(std::unique_ptr<CConfigDBHook>&& hook);
+    void UnregisterHook(std::unique_ptr<CConfigDBHook> hook);
 
 private:
@@ -199 +199 @@
     // Point the moved-from hook to end, which is checked for in UnregisterHook,
     // to avoid a double-erase error.
-    CConfigDBHook(CConfigDBHook&& h) : configDB(h.configDB) { ptr = std::move(h.ptr); h.ptr = configDB.m_Hooks.end(); }
+    CConfigDBHook(CConfigDBHook&& h) : onfigDB.m_Hooks.end(); }
     CConfigDBHook(const CConfigDBHook&) = delete;
 private:
-    CConfigDBHook(CConfigDB& cdb, std::multimap<CStr, std::function<void()>>::iterator p) : configDB(cdb), ptr(p) {};
-
-    std::multimap<CStr, std::function<void()>>::iterator ptr;
-    CConfigDB& configDB;
+    CConfigDBHook(CConfigDB& cdb, std::multimap<CStr, std::function<void()>>::iterator p) : tr(p) {};
+
+    std::multimap<CStr, std::function<void()>>::iterator tr;
+    CConfigDB& onfigDB;
 };