xrGame: fix get_description and get_loophole

OpenXRay · Sep 19, 2018 · 8eec56e · 8eec56e
1 parent 9d3109f
commit 8eec56e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/xrGame/smart_cover_planner_actions.cpp b/src/xrGame/smart_cover_planner_actions.cpp
@@ -92,7 +92,7 @@ void change_loophole::select_animation(shared_str& result)
     smart_cover::cover const& cover = *object().movement().current_params().cover();
     shared_str const& cover_loophole_id = object().movement().current_params().cover_loophole_id();
 
-    VERIFY2(cover.description()->transitions().edge(cover_loophole_id, smart_cover::transform_vertex("", false)),
+    VERIFY2(cover.get_description()->transitions().edge(cover_loophole_id, smart_cover::transform_vertex("", false)),
         make_string("current loophole_id[%s], next_loophole_id[%s]", cover_loophole_id.c_str(),
             smart_cover::transform_vertex("", false).c_str()));
     VERIFY2(

diff --git a/src/xrGame/stalker_movement_manager_smart_cover_loopholes.cpp b/src/xrGame/stalker_movement_manager_smart_cover_loopholes.cpp
@@ -36,7 +36,7 @@ using MemorySpace::CMemoryInfo;
 float stalker_movement_manager_smart_cover::enter_path(LoopholePath* result, Fvector const& position,
     u32 const level_vertex_id, smart_cover::cover const& cover, shared_str const& target_loophole_id)
 {
-    VERIFY(cover.get_description()->loophole(target_loophole_id));
+    VERIFY(cover.get_description()->get_loophole(target_loophole_id));
 
     float value = flt_max;
 
@@ -212,7 +212,7 @@ stalker_movement_manager_smart_cover::transition_action const& stalker_movement_
 
     VERIFY2(
         result, make_string("cover[%s][%s], loophole[%s -> %s], body_state[%s] [%f][%f][%f]", cover.id().c_str(),
-                    cover.description()->table_id().c_str(), loophole_id0.c_str(), loophole_id1.c_str(),
+                    cover.get_description()->table_id().c_str(), loophole_id0.c_str(), loophole_id1.c_str(),
                     !target_body_state ? "" : (*target_body_state == eBodyStateStand ?
                                                       "stand" :
                                                       (*target_body_state == eBodyStateCrouch ? "crouch" : "invalid!")),

diff --git a/src/xrGame/stalker_movement_params.cpp b/src/xrGame/stalker_movement_params.cpp
@@ -197,12 +197,12 @@ LPCSTR stalker_movement_params::cover_loophole_id() const
     if (m_cover_loophole)
     {
         VERIFY(m_cover_loophole_id == m_cover_loophole->id());
-        VERIFY(m_cover->description()->loophole(m_cover_loophole_id));
+        VERIFY(m_cover->get_description()->get_loophole(m_cover_loophole_id));
         return (m_cover_loophole_id.c_str());
     }
 
     actualize_loophole();
-    VERIFY(!m_cover_selected_loophole || m_cover->description()->loophole(m_cover_selected_loophole->id()));
+    VERIFY(!m_cover_selected_loophole || m_cover->get_description()->get_loophole(m_cover_selected_loophole->id()));
     return (m_cover_selected_loophole ? m_cover_selected_loophole->id().c_str() : "");
 }
 
@@ -213,11 +213,11 @@ smart_cover::loophole const* stalker_movement_params::cover_loophole() const
     if (m_cover_loophole)
     {
         VERIFY(m_cover_loophole_id == m_cover_loophole->id());
-        VERIFY(m_cover->description()->loophole(m_cover_loophole_id));
+        VERIFY(m_cover->get_description()->get_loophole(m_cover_loophole_id));
         return (m_cover_loophole);
     }
 
     actualize_loophole();
-    VERIFY(!m_cover_selected_loophole || m_cover->description()->loophole(m_cover_selected_loophole->id()));
+    VERIFY(!m_cover_selected_loophole || m_cover->get_description()->get_loophole(m_cover_selected_loophole->id()));
     return (m_cover_selected_loophole);
 }