1
This commit is contained in:
parent
d231975dbb
commit
781dc2f18d
@ -1406,7 +1406,6 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
|
||||
long long duration = room->GetGasInactiveTime() * SERVER_FRAME_RATE -
|
||||
(room->GetFrameNo() - room->GetGasData().gas_start_frameno);
|
||||
gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000);
|
||||
gas_data->set_total_duration(room->GetGasInactiveTime());
|
||||
} else if (room->GetGasData().GetGasMode() == GasJump) {
|
||||
gas_data->set_duration(0);
|
||||
} else if (room->GetGasData().GetGasMode() == GasMoving) {
|
||||
@ -1430,6 +1429,11 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
|
||||
gas_data->set_duration(0);
|
||||
}
|
||||
}
|
||||
{
|
||||
long long passed_frame_num = room->GetFrameNo() - room->GetGasData().gas_start_frameno;
|
||||
float time = std::max(0.0f, gas_data->duration() - passed_frame_num / SERVER_FRAME_RATE) + 1;
|
||||
gas_data->set_total_duration(time);
|
||||
}
|
||||
// 333
|
||||
{
|
||||
glm::vec3 v3(room->GetGasData().pos_old.x, 0.0f, room->GetGasData().pos_old.y);
|
||||
|
Loading…
x
Reference in New Issue
Block a user