diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 4f68226..8f064f2 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -3360,7 +3360,8 @@ void Human::DoGetOnWithLoot(Loot* entity) this, entity->GetEntityUniId(), item_meta, - entity->GetPos() + entity->GetPos(), + team_id ); car->GetOn(this); room->TakeOnCarObject(entity->GetEntityUniId()); diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index dfcda0b..30b97b9 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -838,7 +838,8 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google: this, car_uniid, item_meta, - GetPos() + GetPos(), + team_id ); car->GetOn(this); } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index a156e47..0705894 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -577,12 +577,14 @@ void Room::CreateBullet(Creature* sender, Car* Room::CreateCar(Human* driver, int car_uniid, MetaData::Equip* item_meta, - const a8::Vec2& pos) + const a8::Vec2& pos, + int team_id) { Car* car = EntityFactory::Instance()->MakeCar(AllocUniid()); car->car_uniid = car_uniid; car->meta = item_meta; car->room = this; + car->team_id = team_id; car->SetPos(pos); MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(car->meta->i->buffid()); if (buff_meta) { diff --git a/server/gameserver/room.h b/server/gameserver/room.h index d61168a..4a66b11 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -120,7 +120,8 @@ public: Car* CreateCar(Human* driver, int car_uniid, MetaData::Equip* meta, - const a8::Vec2& pos); + const a8::Vec2& pos, + int team_id); Hero* CreateHero(Creature* master, MetaData::Player* meta, const a8::Vec2& pos,