Fixed Clear Sky upgrades (#382)

OpenXRay · Oct 15, 2021 · 2f9bbe5 · 2f9bbe5
1 parent e2ef829
commit 2f9bbe5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/xrGame/inventory_upgrade_group.cpp b/src/xrGame/inventory_upgrade_group.cpp
@@ -85,9 +85,16 @@ UpgradeStateResult Group::can_install(CInventoryItem& item, UpgradeBase& test_up
         {
             continue;
         }
-        //		if ( !item.has_upgrade( (*ib)->id() ) )
-        Upgrade* U = smart_cast<Upgrade*>(*ib);
-        if (!item.has_upgrade_group(U->parent_group_id()))
+        bool cant_install; // XXX Clear Sky upgrades: find a dynamic, universal solution
+        if (ClearSkyMode)
+            cant_install = !item.has_upgrade((*ib)->id());
+        else
+        {
+            Upgrade* U = smart_cast<Upgrade*>(*ib);
+            cant_install = !item.has_upgrade_group(U->parent_group_id());;
+        }
+
+        if (cant_install)
         {
             if (loading)
             {

diff --git a/src/xrGame/inventory_upgrade_root.cpp b/src/xrGame/inventory_upgrade_root.cpp
@@ -147,7 +147,8 @@ void Root::highlight_hierarchy(shared_str const& upgrade_id)
     {
         if ((*ib)->id()._get() == upgrade_id._get())
         {
-            //			(*ib)->highlight_up();
+            if (ClearSkyMode) // XXX Clear Sky upgrades: find a dynamic, universal solution
+                (*ib)->highlight_up();
             (*ib)->highlight_down();
             return;
         }