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-31 16:23:34 +08:00
parent 4c0e738d99
commit beffffff30
4 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/obstacle.cc
View File

@ -476,8 +476,7 @@ void Obstacle::OnBulletHit(Bullet* bullet)
return; return;
} }
if (!IsDead(bullet->room) && if (!IsDead(bullet->room)) {
!IsTerminatorAirDropBox(bullet->room)) {
if (meta->receive_special_damage_type != 0 && if (meta->receive_special_damage_type != 0 &&
((bullet->gun_meta->special_damage_type & meta->receive_special_damage_type) == 0)) { ((bullet->gun_meta->special_damage_type & meta->receive_special_damage_type) == 0)) {
return; return;

1
server/gameserver/obstacle.h
View File

@ -45,7 +45,6 @@ class Obstacle : public Entity
virtual void OnBulletHit(Bullet* bullet) override; virtual void OnBulletHit(Bullet* bullet) override;
virtual void OnExplosionHit(Explosion* explosion) override; virtual void OnExplosionHit(Explosion* explosion) override;
virtual bool Attackable(Room* room) override; virtual bool Attackable(Room* room) override;
virtual bool IsTerminatorAirDropBox(Room* room) { return false; }
virtual bool CanThroughable(Creature* c); virtual bool CanThroughable(Creature* c);
virtual bool CanThroughable(Bullet* bullet); virtual bool CanThroughable(Bullet* bullet);
virtual bool DoInteraction(Human* sender); virtual bool DoInteraction(Human* sender);

1
server/gameserver/room.h
View File

@ -350,7 +350,6 @@ private:
int creator_channel_ = 0; int creator_channel_ = 0;
bool force_entry_newbie_room_ = false; bool force_entry_newbie_room_ = false;
xtimer_list* battle_report_timer_ = nullptr; xtimer_list* battle_report_timer_ = nullptr;
bool sent_terminator_airdrop = false;
int current_teamid_ = 0; int current_teamid_ = 0;
int current_uniid_ = FIXED_OBJECT_MAXID; int current_uniid_ = FIXED_OBJECT_MAXID;

2
server/gameserver/roomobstacle.h
View File

@ -12,7 +12,6 @@ class RoomObstacle : public Obstacle
Room* room = nullptr; Room* room = nullptr;
a8::XTimerAttacher xtimer_attacher; a8::XTimerAttacher xtimer_attacher;
bool is_treasure_box = false; bool is_treasure_box = false;
bool is_terminator_airdrop_box = false;
CreatureWeakPtr master; CreatureWeakPtr master;
int real_object_uniid = 0; int real_object_uniid = 0;
std::shared_ptr<Ability> context_ability; std::shared_ptr<Ability> context_ability;
@ -21,7 +20,6 @@ class RoomObstacle : public Obstacle
virtual ~RoomObstacle() override; virtual ~RoomObstacle() override;
virtual void Initialize() override; virtual void Initialize() override;
virtual void RecalcSelfCollider() override; virtual void RecalcSelfCollider() override;
virtual bool IsTerminatorAirDropBox(Room* room) override { return is_terminator_airdrop_box; }
virtual bool DoInteraction(Human* sender) override; virtual bool DoInteraction(Human* sender) override;
virtual void OnBattleStart(Room* room) override; virtual void OnBattleStart(Room* room) override;
void ActiveTimerFunc(); void ActiveTimerFunc();