Skip to content

Commit 8eec56e

Browse files
committed
xrGame: fix get_description and get_loophole
1 parent 9d3109f commit 8eec56e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/xrGame/smart_cover_planner_actions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void change_loophole::select_animation(shared_str& result)
9292
smart_cover::cover const& cover = *object().movement().current_params().cover();
9393
shared_str const& cover_loophole_id = object().movement().current_params().cover_loophole_id();
9494

95-
VERIFY2(cover.description()->transitions().edge(cover_loophole_id, smart_cover::transform_vertex("", false)),
95+
VERIFY2(cover.get_description()->transitions().edge(cover_loophole_id, smart_cover::transform_vertex("", false)),
9696
make_string("current loophole_id[%s], next_loophole_id[%s]", cover_loophole_id.c_str(),
9797
smart_cover::transform_vertex("", false).c_str()));
9898
VERIFY2(

src/xrGame/stalker_movement_manager_smart_cover_loopholes.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ using MemorySpace::CMemoryInfo;
3636
float stalker_movement_manager_smart_cover::enter_path(LoopholePath* result, Fvector const& position,
3737
u32 const level_vertex_id, smart_cover::cover const& cover, shared_str const& target_loophole_id)
3838
{
39-
VERIFY(cover.get_description()->loophole(target_loophole_id));
39+
VERIFY(cover.get_description()->get_loophole(target_loophole_id));
4040

4141
float value = flt_max;
4242

@@ -212,7 +212,7 @@ stalker_movement_manager_smart_cover::transition_action const& stalker_movement_
212212

213213
VERIFY2(
214214
result, make_string("cover[%s][%s], loophole[%s -> %s], body_state[%s] [%f][%f][%f]", cover.id().c_str(),
215-
cover.description()->table_id().c_str(), loophole_id0.c_str(), loophole_id1.c_str(),
215+
cover.get_description()->table_id().c_str(), loophole_id0.c_str(), loophole_id1.c_str(),
216216
!target_body_state ? "" : (*target_body_state == eBodyStateStand ?
217217
"stand" :
218218
(*target_body_state == eBodyStateCrouch ? "crouch" : "invalid!")),

src/xrGame/stalker_movement_params.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ LPCSTR stalker_movement_params::cover_loophole_id() const
197197
if (m_cover_loophole)
198198
{
199199
VERIFY(m_cover_loophole_id == m_cover_loophole->id());
200-
VERIFY(m_cover->description()->loophole(m_cover_loophole_id));
200+
VERIFY(m_cover->get_description()->get_loophole(m_cover_loophole_id));
201201
return (m_cover_loophole_id.c_str());
202202
}
203203

204204
actualize_loophole();
205-
VERIFY(!m_cover_selected_loophole || m_cover->description()->loophole(m_cover_selected_loophole->id()));
205+
VERIFY(!m_cover_selected_loophole || m_cover->get_description()->get_loophole(m_cover_selected_loophole->id()));
206206
return (m_cover_selected_loophole ? m_cover_selected_loophole->id().c_str() : "");
207207
}
208208

@@ -213,11 +213,11 @@ smart_cover::loophole const* stalker_movement_params::cover_loophole() const
213213
if (m_cover_loophole)
214214
{
215215
VERIFY(m_cover_loophole_id == m_cover_loophole->id());
216-
VERIFY(m_cover->description()->loophole(m_cover_loophole_id));
216+
VERIFY(m_cover->get_description()->get_loophole(m_cover_loophole_id));
217217
return (m_cover_loophole);
218218
}
219219

220220
actualize_loophole();
221-
VERIFY(!m_cover_selected_loophole || m_cover->description()->loophole(m_cover_selected_loophole->id()));
221+
VERIFY(!m_cover_selected_loophole || m_cover->get_description()->get_loophole(m_cover_selected_loophole->id()));
222222
return (m_cover_selected_loophole);
223223
}

0 commit comments

Comments
 (0)