This commit is contained in:
aozhiwei 2021-05-06 16:22:48 +08:00
parent b52a2f4778
commit 1efa6d0aaf
4 changed files with 6 additions and 0 deletions

View File

@ -35,6 +35,7 @@ void Car::Initialize()
weapons[GUN_SLOT1].Recalc();
SetCurrWeapon(&weapons[GUN_SLOT1]);
}
born_frameno_ = room->GetFrameNo();
}
void Car::FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data)
@ -60,6 +61,7 @@ void Car::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data)
auto less_data = p->add_passengers();
hum->FillMFObjectLess(room, hum, less_data);
}
p->set_born_frameno(ceil(born_frameno_ / 2.0));
}
void Car::GetDown(Human* passenger)

View File

@ -34,6 +34,7 @@ class Car : public Creature
int AllocSeat();
private:
long long born_frameno_ = 0;
bool later_removed_ = false;
Human* driver_ = nullptr;
std::set<Human*> passengers_;

View File

@ -13,6 +13,7 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
cs::SMUpdate* msg = new cs::SMUpdate;
{
Room* room = hum->room;
msg->set_frameno(room->GetFrameNo() / 2);
if (room->GetGasData().gas_mode == GasJump) {
cs::MFPlane* p = msg->mutable_plane();
TypeConvert::ToPb(room->plane.start_point, p->mutable_start_point());

View File

@ -441,6 +441,7 @@ message MFCarFull
!!!
*/
repeated MFPlayerFull passengers = 6;
optional int32 born_frameno = 8; // born_frameno == SMUpdate.frmanoe时表示在当前这帧出生
}
//-
@ -1057,6 +1058,7 @@ message SMUpdate
//
repeated MFPosition object_positions = 43; //,part_objects则可能不发,part_objects里的左边更新小地图
optional int32 game_left_time = 45; //(, )
optional int32 frameno = 46;
}
//