From ff31a1d4b1d7af127e5a982cd20138c2f155b8cd Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 2 Apr 2023 16:56:41 +0800 Subject: [PATCH] 1 --- server/gameserver/collision.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/gameserver/collision.cc b/server/gameserver/collision.cc index f8e211ce..c3257c39 100644 --- a/server/gameserver/collision.cc +++ b/server/gameserver/collision.cc @@ -7,6 +7,7 @@ #include "collision.h" #include "creature.h" #include "obstacle.h" +#include "roomobstacle.h" bool Collision::CheckBullet(IBullet* bullet, Creature* c) { @@ -17,8 +18,11 @@ bool Collision::CheckBullet(IBullet* bullet, Creature* c) ); } -bool Collision::CheckBullet(IBullet* bullet, Entity* c) +bool Collision::CheckBullet(IBullet* bullet, Entity* e) { + if (e->IsEntityType(ET_Obstacle) && ((Obstacle*)e)->IsRoomObstacle()) { + RoomObstacle* ob = (RoomObstacle*)e; + } return false; }