Fix incorrect min->vMin, max->vMax replacements

Uncomment bool bSelected because function wont work without it
OpenXRay · Aug 8, 2017 · 56f23ab · 56f23ab
1 parent 2cef17b
commit 56f23ab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/utils/xrAI/compiler_cover.cpp b/src/utils/xrAI/compiler_cover.cpp
@@ -430,7 +430,7 @@ bool vertex_in_direction(const u32& start_vertex_id, const u32& target_vertex_id
                     return (true);
 
                 Fvector2 temp2;
-                temp2.add(box.vMin, box.vMax);
+                temp2.add(box.min, box.max);
                 temp2.mul(.5f);
                 float dist = _sqr(temp2.x - dest.x) + _sqr(temp2.y - dest.y);
                 if (dist > cur_sqr)

diff --git a/src/utils/xrLC/OGF_Face.cpp b/src/utils/xrLC/OGF_Face.cpp
@@ -522,8 +522,8 @@ void OGF_Node::Save(IWriter& fs)
     H.format_version = xrOGF_FormatVersion;
     H.type = MT_HIERRARHY;
     H.shader_id = 0;
-    H.bb.vMin = bbox.vMin;
-    H.bb.vMax = bbox.vMax;
+    H.bb.min = bbox.vMin;
+    H.bb.max = bbox.vMax;
     H.bs.c = C;
     H.bs.r = R;
     fs.w(&H, sizeof(H));
@@ -551,8 +551,8 @@ void OGF_LOD::Save(IWriter& fs)
     H.format_version = xrOGF_FormatVersion;
     H.type = MT_LOD;
     H.shader_id = RegisterShader(sid);
-    H.bb.vMin = bbox.vMin;
-    H.bb.vMax = bbox.vMax;
+    H.bb.min = bbox.vMin;
+    H.bb.max = bbox.vMax;
     H.bs.c = C;
     H.bs.r = R;
     fs.w(&H, sizeof(H));

diff --git a/src/utils/xrLC/OGF_Face_Save.cpp b/src/utils/xrLC/OGF_Face_Save.cpp
@@ -150,8 +150,8 @@ void OGF::Save(IWriter& fs)
     H.format_version = xrOGF_FormatVersion;
     H.type = data.m_SWI.count ? MT_PROGRESSIVE : MT_NORMAL;
     H.shader_id = RegisterShader(sid);
-    H.bb.vMin = bbox.vMin;
-    H.bb.vMax = bbox.vMax;
+    H.bb.min = bbox.vMin;
+    H.bb.max = bbox.vMax;
     H.bs.c = C;
     H.bs.r = R;
 
@@ -197,8 +197,8 @@ void OGF_Reference::Save(IWriter& fs)
     H.format_version = xrOGF_FormatVersion;
     H.type = model->data.m_SWI.count ? MT_TREE_PM : MT_TREE_ST;
     H.shader_id = RegisterShader(sid);
-    H.bb.vMin = bbox.vMin;
-    H.bb.vMax = bbox.vMax;
+    H.bb.min = bbox.vMin;
+    H.bb.max = bbox.vMax;
     H.bs.c = C;
     H.bs.r = R;
 

diff --git a/src/xrServerEntities/xrServer_Objects_ALife.cpp b/src/xrServerEntities/xrServer_Objects_ALife.cpp
@@ -315,8 +315,8 @@ void CSE_ALifeGraphPoint::FillProps(LPCSTR pref, PropItemVec& items)
 #endif // #ifdef XRSE_FACTORY_EXPORTS
 }
 
-void CSE_ALifeGraphPoint::on_render(CDUInterface* du, IServerEntityLEOwner* /*owner*/,
-    bool /*bSelected*/, const Fmatrix& parent, int /*priority*/, bool /*strictB2F*/)
+void CSE_ALifeGraphPoint::on_render(CDUInterface* du, IServerEntityLEOwner* owner,
+    bool bSelected, const Fmatrix& parent, int priority, bool strictB2F)
 {
 #ifdef XRSE_FACTORY_EXPORTS
     static const u32 IL[16] = {0, 1, 0, 2, 0, 3, 0, 4, 1, 3, 3, 2, 2, 4, 4, 1};