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 2023-04-02 17:12:35 +08:00
parent 4b4fed3a62
commit 673580d178
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/gameserver/collision.cc
View File

@ -9,6 +9,9 @@
#include "obstacle.h" #include "obstacle.h"
#include "roomobstacle.h" #include "roomobstacle.h"
#include "mt/Map.h"
#include "mt/MapThing.h"
bool Collision::CheckBullet(IBullet* bullet, Creature* c) bool Collision::CheckBullet(IBullet* bullet, Creature* c)
{ {
return a8::IntersectCylinderCylinder return a8::IntersectCylinderCylinder
@ -26,6 +29,20 @@ bool Collision::CheckBullet(IBullet* bullet, Entity* e)
if (distance > 300) { if (distance > 300) {
return false; return false;
} }
if (ob->init_args) {
auto wobj = ob->init_args->Get<std::shared_ptr<mt::WorldObject>>(0);
return a8::IntersectCylinderCylinder
(
bullet->GetPos().ToGlmVec3(), bullet->GetHitRadius() * 0.6, 10,
e->GetPos().ToGlmVec3(), std::max(wobj->size.x/2.0f, wobj->size.z/2.0f), 10
);
} else {
return a8::IntersectCylinderCylinder
(
bullet->GetPos().ToGlmVec3(), bullet->GetHitRadius() * 0.6, 10,
e->GetPos().ToGlmVec3(), ob->meta->width(), 10
);
}
} }
return false; return false;
} }