1
This commit is contained in:
parent
eefdec80f3
commit
48157321db
@ -107,7 +107,9 @@ void Car::GetDown(Human* passenger)
|
||||
passenger->CancelAction();
|
||||
passenger->RemoveBuffByEffectId(kBET_Driver);
|
||||
passenger->RemoveBuffByEffectId(kBET_Passenger);
|
||||
Global::Instance()->verify_set_pos = 1;
|
||||
passenger->SetPos(passenger->GetPos());
|
||||
Global::Instance()->verify_set_pos = 0;
|
||||
room->frame_event.AddCarChg(passenger->GetWeakPtrRef());
|
||||
if (passengers_.empty()) {
|
||||
team_id = 0;
|
||||
@ -160,7 +162,9 @@ void Car::GetOn(Human* passenger)
|
||||
}
|
||||
passenger->SetCar(this);
|
||||
passenger->SetSeat(seat);
|
||||
Global::Instance()->verify_set_pos = 1;
|
||||
passenger->SetPos(GetPos());
|
||||
Global::Instance()->verify_set_pos = 0;
|
||||
{
|
||||
const mt::Buff* buff_meta = mt::Buff::GetById
|
||||
(driver_ == passenger ? DRIVER_BUFFID : PASSENGER_BUFFID);
|
||||
@ -250,7 +254,9 @@ int Car::AllocSeat()
|
||||
void Car::SyncPos()
|
||||
{
|
||||
if (driver_) {
|
||||
Global::Instance()->verify_set_pos = 1;
|
||||
SetPos(driver_->GetPos());
|
||||
Global::Instance()->verify_set_pos = 0;
|
||||
SetMoveDir(driver_->GetMoveDir());
|
||||
for (auto hum : passengers_) {
|
||||
if (hum != driver_) {
|
||||
|
@ -3741,7 +3741,7 @@ void Room::CreateWorldObjects()
|
||||
);
|
||||
#if 1
|
||||
{
|
||||
const mt::Equip* equip_meta = mt::Equip::GetById(30501);
|
||||
const mt::Equip* equip_meta = mt::Equip::GetById(30502);
|
||||
if (equip_meta) {
|
||||
int car_uniid = AllocUniid();
|
||||
Car* c = CreateCar(nullptr,
|
||||
|
Loading…
x
Reference in New Issue
Block a user