server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2022-12-16 13:23:22 +08:00
parent 359c59f350
commit 885fcc8835
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/mapinstance.cc
View File

@ -517,7 +517,7 @@ bool MapInstance::Raycast(int layer, const glm::vec3& start, const glm::vec3& en
hit_pos_[1] = h; hit_pos_[1] = h;
hit_pos_[2] = hit_pos_copy[2]; hit_pos_[2] = hit_pos_copy[2];
} else { } else {
abort(); //abort();
} }
hit_result = true; hit_result = true;
} }
@ -580,8 +580,13 @@ bool MapInstance::GetPosHeight(const Position& pos, float& out_height)
a8::XPrintf("getPosHeight:%d\n", {startRef}); a8::XPrintf("getPosHeight:%d\n", {startRef});
auto ret = navmesh_query_->getPolyHeight(startRef, nearestPt, &out_height); auto ret = navmesh_query_->getPolyHeight(startRef, nearestPt, &out_height);
#if 0
assert(ret == DT_SUCCESS); assert(ret == DT_SUCCESS);
#endif
if (ret != DT_SUCCESS) {
out_height = pos.y;
return false;
}
return true; return true;
} }

6
server/gameserver/movehelper.cc
View File

@ -35,7 +35,7 @@ bool MoveHelper::GetMovePosition(glm::vec3& out_pos)
}); });
curr_point.curr_pos.y = h; curr_point.curr_pos.y = h;
} else { } else {
abort(); //abort();
} }
curr_point.curr_pos.AddVec2(dir * owner_->GetSpeed()); curr_point.curr_pos.AddVec2(dir * owner_->GetSpeed());
owner_->SetPos(curr_point.curr_pos); owner_->SetPos(curr_point.curr_pos);
@ -51,7 +51,7 @@ bool MoveHelper::GetMovePosition(glm::vec3& out_pos)
new_pos.y = h; new_pos.y = h;
owner_->SetPos(new_pos); owner_->SetPos(new_pos);
} else { } else {
abort(); //abort();
} }
} }
if (owner_->GetPos().Distance2D2(curr_point.src_pos) - curr_point.distance >= 0.0001f) { if (owner_->GetPos().Distance2D2(curr_point.src_pos) - curr_point.distance >= 0.0001f) {
@ -70,7 +70,7 @@ bool MoveHelper::GetMovePosition(glm::vec3& out_pos)
new_pos.y = h; new_pos.y = h;
owner_->SetPos(new_pos); owner_->SetPos(new_pos);
} else { } else {
abort(); //abort();
} }
++path_index_; ++path_index_;
if (path_index_ < paths_.size()) { if (path_index_ < paths_.size()) {