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-08-11 17:23:32 +08:00
parent 568cc480b7
commit 3d5b004acc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/creature.cc
View File

@ -119,7 +119,11 @@ void InternalShot(Creature* c,
} }
for (auto& tuple : weapon_meta->bullet_born_offset) { for (auto& tuple : weapon_meta->bullet_born_offset) {
a8::Vec2 bullet_born_offset = a8::Vec2(std::get<0>(tuple), std::get<1>(tuple)); a8::Vec2 bullet_born_offset = a8::Vec2(std::get<0>(tuple), std::get<1>(tuple));
bullet_born_offset.Rotate(c->GetAttackDir().CalcAngle(a8::Vec2::UP)); float bullet_born_angle = c->GetAttackDir().CalcAngleEx(a8::Vec2::UP);
if (c->GetAttackDir().x > 0.00001f) {
bullet_born_angle = -bullet_born_angle;
}
bullet_born_offset.Rotate(bullet_born_angle);
a8::Vec2 bullet_born_pos = c->GetPos() + bullet_born_offset; a8::Vec2 bullet_born_pos = c->GetPos() + bullet_born_offset;
if (c->room->OverBorder(bullet_born_pos, 0.0f)) { if (c->room->OverBorder(bullet_born_pos, 0.0f)) {
return; return;
@ -138,7 +142,11 @@ void InternalShot(Creature* c,
} }
for (auto& tuple : weapon_meta->bullet_born_offset) { for (auto& tuple : weapon_meta->bullet_born_offset) {
a8::Vec2 bullet_born_offset = a8::Vec2(std::get<0>(tuple), std::get<1>(tuple)); a8::Vec2 bullet_born_offset = a8::Vec2(std::get<0>(tuple), std::get<1>(tuple));
bullet_born_offset.Rotate(c->GetAttackDir().CalcAngle(a8::Vec2::UP)); float bullet_born_angle = c->GetAttackDir().CalcAngleEx(a8::Vec2::UP);
if (c->GetAttackDir().x > 0.00001f) {
bullet_born_angle = -bullet_born_angle;
}
bullet_born_offset.Rotate(bullet_born_angle);
a8::Vec2 bullet_born_pos = c->GetPos() + c->shoot_offset + bullet_born_offset; a8::Vec2 bullet_born_pos = c->GetPos() + c->shoot_offset + bullet_born_offset;
a8::Vec2 bullet_dir = c->GetAttackDir(); a8::Vec2 bullet_dir = c->GetAttackDir();
float bullet_angle = std::get<2>(tuple); float bullet_angle = std::get<2>(tuple);