1
This commit is contained in:
parent
c7394c2ff9
commit
2a866392ee
@ -258,6 +258,8 @@ void Car::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int
|
|||||||
cur_buff_id_ = std::get<1>(meta->car_buff_list[cur_buff_idx_]);
|
cur_buff_id_ = std::get<1>(meta->car_buff_list[cur_buff_idx_]);
|
||||||
if (cur_buff_id_ != 0) {
|
if (cur_buff_id_ != 0) {
|
||||||
MustBeAddBuff(this, cur_buff_id_);
|
MustBeAddBuff(this, cur_buff_id_);
|
||||||
|
#ifdef DEBUG
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -336,3 +338,10 @@ void Car::Explosion(int team_id)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Car::SendDebugMsg(const std::string& debug_msg)
|
||||||
|
{
|
||||||
|
for (auto& passenger : passengers_) {
|
||||||
|
passenger->SendDebugMsg("载具debugmsg: " + debug_msg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -34,6 +34,7 @@ class Car : public Creature
|
|||||||
virtual float GetRadius() override;
|
virtual float GetRadius() override;
|
||||||
virtual float GetSpeed() override;
|
virtual float GetSpeed() override;
|
||||||
virtual void DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id) override;
|
virtual void DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id) override;
|
||||||
|
virtual void SendDebugMsg(const std::string& debug_msg) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int AllocSeat();
|
int AllocSeat();
|
||||||
|
@ -654,9 +654,11 @@ void Room::RemoveObjectLater(RoomEntity* entity)
|
|||||||
break;
|
break;
|
||||||
case ET_Car:
|
case ET_Car:
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
entity->RemoveFromAroundPlayers(entity->room);
|
entity->RemoveFromAroundPlayers(entity->room);
|
||||||
entity->BroadcastDeleteState(entity->room);
|
entity->BroadcastDeleteState(entity->room);
|
||||||
entity->room->grid_service->RemoveCreature((Car*)entity);
|
entity->room->grid_service->RemoveCreature((Car*)entity);
|
||||||
|
#endif
|
||||||
entity->room->RemoveFromMoveableHash((Car*)entity);
|
entity->room->RemoveFromMoveableHash((Car*)entity);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user