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

1

Browse Source
This commit is contained in:
aozhiwei 2021-07-22 16:26:49 +08:00
parent 0b1a514649
commit cdbfd129da
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/gameserver/dummyentity.cc
View File

@ -14,6 +14,19 @@ void DummyEntity::Initialize()
for (auto& obj : *blocks) { for (auto& obj : *blocks) {
switch (obj.shape()) { switch (obj.shape()) {
case 1: case 1:
{
CircleCollider* collider = new CircleCollider();
collider->owner = this;
collider->pos = a8::Vec2(obj.x(), obj.y());
collider->rad = obj.rad();
if (obj.bullet_penetrate()) {
a8::SetBitFlag(collider->tag, kHalfWallTag);
}
AddEntityCollider(collider);
permanent_map_service->AddCollider(collider);
}
break;
case 2:
{ {
AabbCollider* collider = new AabbCollider(); AabbCollider* collider = new AabbCollider();
collider->owner = this; collider->owner = this;
@ -29,19 +42,6 @@ void DummyEntity::Initialize()
permanent_map_service->AddCollider(collider); permanent_map_service->AddCollider(collider);
} }
break; break;
case 2:
{
CircleCollider* collider = new CircleCollider();
collider->owner = this;
collider->pos = a8::Vec2(obj.x(), obj.y());
collider->rad = obj.rad();
if (obj.bullet_penetrate()) {
a8::SetBitFlag(collider->tag, kHalfWallTag);
}
AddEntityCollider(collider);
permanent_map_service->AddCollider(collider);
}
break;
default: default:
{ {
} }

6
server/gameserver/mapblock.cc
View File

@ -70,11 +70,11 @@ void MapBlock::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_d
cs::MFCollider* collider = full_data->mutable_union_obj_2()->mutable_collider(); cs::MFCollider* collider = full_data->mutable_union_obj_2()->mutable_collider();
collider->set_shape(shape); collider->set_shape(shape);
if (shape == 1) { if (shape == 1) {
collider->set_width(width);
collider->set_height(height);
} else {
collider->set_width(rad); collider->set_width(rad);
collider->set_height(rad); collider->set_height(rad);
} else {
collider->set_width(width);
collider->set_height(height);
} }
} }
} }