WIP of xrAI and xrSE_Factory. Fix Debug crash. Fix some strange things.

OpenXRay · Dec 30, 2017 · 376e015 · 376e015
1 parent d58139f
commit 376e015
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/utils/xrAI/compiler_cover.cpp b/src/utils/xrAI/compiler_cover.cpp
@@ -516,16 +516,14 @@ void compute_non_covers()
 
         float cumulative_weight = 0.f;
         {
-            COVERS::const_iterator i = nearest.begin();
-            COVERS::const_iterator e = nearest.end();
-            for (; i != e; ++i)
+            for (auto &i : nearest)
             {
-                if (!vertex_in_direction(u32(I - B), (*i)->level_vertex_id()))
+                if (!vertex_in_direction(u32(I - B), i->level_vertex_id()))
                     continue;
 
-                float weight = 1.f / (*i)->position().distance_to((*I).Pos);
+                float weight = 1.f / i->position().distance_to((*I).Pos);
                 cumulative_weight += weight;
-                cover_pairs.push_back(std::make_pair(weight, *i));
+                cover_pairs.push_back(std::make_pair(weight, i));
             }
         }
 
@@ -552,20 +550,18 @@ void compute_non_covers()
             (*I).low_cover[j] = 0.f;
         }
 
-        COVER_PAIRS::const_iterator i = cover_pairs.begin();
-        COVER_PAIRS::const_iterator e = cover_pairs.end();
-        for (; i != e; ++i)
+        for (auto &i : cover_pairs)
         {
-            vertex& current = g_nodes[(*i).second->level_vertex_id()];
-            float factor = (*i).first / cumulative_weight;
+            vertex& current = g_nodes[i.second->level_vertex_id()];
+            float factor = i.first / cumulative_weight;
             for (int j = 0; j < 4; ++j)
             {
                 (*I).high_cover[j] += factor * current.high_cover[j];
                 (*I).low_cover[j] += factor * current.low_cover[j];
             }
         }
 
-        for (int i2 = 0; i2 < 4; ++i)
+        for (int i2 = 0; i2 < 4; ++i2)
         {
             clamp((*I).high_cover[i2], 0.f, 1.f);
             clamp((*I).low_cover[i2], 0.f, 1.f);

diff --git a/src/utils/xrSE_Factory/xrSE_Factory.cpp b/src/utils/xrSE_Factory/xrSE_Factory.cpp
@@ -50,8 +50,8 @@ BOOL APIENTRY DllMain(HANDLE module_handle, DWORD call_reason, LPVOID reserved)
     case DLL_PROCESS_ATTACH:
     {
         //g_temporary_stuff = &trivial_encryptor::decode;
-        xrDebug::Initialize(false);
-        Core.Initialize("xrSE_Factory", nullptr, true, "fsfactory.ltx");
+        //xrDebug::Initialize(false);
+        //Core.Initialize("xrSE_Factory", nullptr, true, "fsfactory.ltx");
         string_path SYSTEM_LTX;
         FS.update_path(SYSTEM_LTX, "$game_config$", "system.ltx");
         pSettings = new CInifile(SYSTEM_LTX);
@@ -76,7 +76,7 @@ BOOL APIENTRY DllMain(HANDLE module_handle, DWORD call_reason, LPVOID reserved)
         xr_delete(g_object_factory);
         if (prop_helper_module)
             prop_helper_module->close();
-        Core._destroy();
+        //Core._destroy();
         break;
     }
     }