diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index a04f677..3937713 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -4237,10 +4237,10 @@ void Human::DoGetOnWithLoot(Loot* entity) } car_ = room->CreateCar( this, + entity->GetEntityUniId(), item_meta, GetPos() ); - car_->car_uniid = entity->GetEntityUniId(); SetCar(car_); SetSeat(0); SetPos(entity->GetPos()); diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index b0ff57d..94b7d0f 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -798,10 +798,10 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google: Car* car = room->CreateCar ( this, + car_uniid, item_meta, GetPos() ); - car->car_uniid = car_uniid; SetCar(car); SetSeat(0); } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 1c8268c..5ea3997 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -524,6 +524,7 @@ void Room::CreateBullet(Human* hum, } Car* Room::CreateCar(Human* driver, + int car_uniid, MetaData::Equip* meta, const a8::Vec2& pos) { diff --git a/server/gameserver/room.h b/server/gameserver/room.h index 5aa8393..8e67b28 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -108,6 +108,7 @@ public: float fly_distance, bool is_tank_skin = false); Car* CreateCar(Human* driver, + int car_uniid, MetaData::Equip* meta, const a8::Vec2& pos);