mirror of
https://github.com/openmoh/openmohaa.git
synced 2025-05-09 12:08:12 +03:00
parent
5816391e9b
commit
5317b8424f
1 changed files with 11 additions and 3 deletions
|
@ -4154,6 +4154,10 @@ void Player::VehicleMove(usercmd_t *ucmd)
|
||||||
|
|
||||||
if (m_pVehicle->Drive(current_ucmd)) {
|
if (m_pVehicle->Drive(current_ucmd)) {
|
||||||
client->ps.commandTime = ucmd->serverTime;
|
client->ps.commandTime = ucmd->serverTime;
|
||||||
|
// Added in OPM
|
||||||
|
// The player can't walk while attached to a vehicle
|
||||||
|
client->ps.groundEntityNum = ENTITYNUM_NONE;
|
||||||
|
client->ps.walking = false;
|
||||||
} else {
|
} else {
|
||||||
ClientMove(ucmd);
|
ClientMove(ucmd);
|
||||||
}
|
}
|
||||||
|
@ -4186,10 +4190,14 @@ void Player::TurretMove(usercmd_t *ucmd)
|
||||||
|
|
||||||
client->ps.gravity = gravity * sv_gravity->value;
|
client->ps.gravity = gravity * sv_gravity->value;
|
||||||
|
|
||||||
if (!m_pTurret->IsSubclassOfTurretGun() || !m_pTurret->UserAim(current_ucmd)) {
|
if (m_pTurret->IsSubclassOfTurretGun() && m_pTurret->UserAim(current_ucmd)) {
|
||||||
ClientMove(ucmd);
|
|
||||||
} else {
|
|
||||||
client->ps.commandTime = ucmd->serverTime;
|
client->ps.commandTime = ucmd->serverTime;
|
||||||
|
// Added in OPM
|
||||||
|
// The player can't walk while attached to a turret
|
||||||
|
client->ps.groundEntityNum = ENTITYNUM_NONE;
|
||||||
|
client->ps.walking = false;
|
||||||
|
} else {
|
||||||
|
ClientMove(ucmd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue