Skip to content

Commit 56f23ab

Browse files
committed
Fix incorrect min->vMin, max->vMax replacements
Uncomment bool bSelected because function wont work without it
1 parent 2cef17b commit 56f23ab

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/utils/xrAI/compiler_cover.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ bool vertex_in_direction(const u32& start_vertex_id, const u32& target_vertex_id
430430
return (true);
431431

432432
Fvector2 temp2;
433-
temp2.add(box.vMin, box.vMax);
433+
temp2.add(box.min, box.max);
434434
temp2.mul(.5f);
435435
float dist = _sqr(temp2.x - dest.x) + _sqr(temp2.y - dest.y);
436436
if (dist > cur_sqr)

src/utils/xrLC/OGF_Face.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -522,8 +522,8 @@ void OGF_Node::Save(IWriter& fs)
522522
H.format_version = xrOGF_FormatVersion;
523523
H.type = MT_HIERRARHY;
524524
H.shader_id = 0;
525-
H.bb.vMin = bbox.vMin;
526-
H.bb.vMax = bbox.vMax;
525+
H.bb.min = bbox.vMin;
526+
H.bb.max = bbox.vMax;
527527
H.bs.c = C;
528528
H.bs.r = R;
529529
fs.w(&H, sizeof(H));
@@ -551,8 +551,8 @@ void OGF_LOD::Save(IWriter& fs)
551551
H.format_version = xrOGF_FormatVersion;
552552
H.type = MT_LOD;
553553
H.shader_id = RegisterShader(sid);
554-
H.bb.vMin = bbox.vMin;
555-
H.bb.vMax = bbox.vMax;
554+
H.bb.min = bbox.vMin;
555+
H.bb.max = bbox.vMax;
556556
H.bs.c = C;
557557
H.bs.r = R;
558558
fs.w(&H, sizeof(H));

src/utils/xrLC/OGF_Face_Save.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ void OGF::Save(IWriter& fs)
150150
H.format_version = xrOGF_FormatVersion;
151151
H.type = data.m_SWI.count ? MT_PROGRESSIVE : MT_NORMAL;
152152
H.shader_id = RegisterShader(sid);
153-
H.bb.vMin = bbox.vMin;
154-
H.bb.vMax = bbox.vMax;
153+
H.bb.min = bbox.vMin;
154+
H.bb.max = bbox.vMax;
155155
H.bs.c = C;
156156
H.bs.r = R;
157157

@@ -197,8 +197,8 @@ void OGF_Reference::Save(IWriter& fs)
197197
H.format_version = xrOGF_FormatVersion;
198198
H.type = model->data.m_SWI.count ? MT_TREE_PM : MT_TREE_ST;
199199
H.shader_id = RegisterShader(sid);
200-
H.bb.vMin = bbox.vMin;
201-
H.bb.vMax = bbox.vMax;
200+
H.bb.min = bbox.vMin;
201+
H.bb.max = bbox.vMax;
202202
H.bs.c = C;
203203
H.bs.r = R;
204204

src/xrServerEntities/xrServer_Objects_ALife.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ void CSE_ALifeGraphPoint::FillProps(LPCSTR pref, PropItemVec& items)
315315
#endif // #ifdef XRSE_FACTORY_EXPORTS
316316
}
317317

318-
void CSE_ALifeGraphPoint::on_render(CDUInterface* du, IServerEntityLEOwner* /*owner*/,
319-
bool /*bSelected*/, const Fmatrix& parent, int /*priority*/, bool /*strictB2F*/)
318+
void CSE_ALifeGraphPoint::on_render(CDUInterface* du, IServerEntityLEOwner* owner,
319+
bool bSelected, const Fmatrix& parent, int priority, bool strictB2F)
320320
{
321321
#ifdef XRSE_FACTORY_EXPORTS
322322
static const u32 IL[16] = {0, 1, 0, 2, 0, 3, 0, 4, 1, 3, 3, 2, 2, 4, 4, 1};

0 commit comments

Comments
 (0)