Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

This commit is contained in:
2021-04-06 21:21:09 +02:00
13 changed files with 1956 additions and 11 deletions

View File

@@ -249,6 +249,13 @@ class RageVehicle extends RageEntity implements IVehicle {
this.vehicle.setDoorShut(door, instantly);
}
get class(): number {
if (mp.vehicles.exists(this.vehicle)) {
return this.vehicle.getClass();
}
return -1;
}
}

View File

@@ -69,6 +69,7 @@ interface IVehicle extends IEntity {
setDoorsLocked(state: boolean);
setDoorShut(door: number, instantly: boolean);
setDoorOpen(door: number, loose: boolean, instantly: boolean);
class: number;
}
interface IEntityPool<TEntity> {

View File

@@ -9,7 +9,7 @@
export default function smoothThrottle() {
let GlobalDisable = false;
let DisableAntiReverse = true;
let DisableAntiReverse = false;
let DisableSmoothThrottle = false;
let BrakeSystem = false;
@@ -47,7 +47,7 @@ export default function smoothThrottle() {
return;
if (BrakeSystem) {
if (mp.players.local.vehicle !== null) {
if (mp.players.local.vehicle && mp.vehicles.exists(mp.players.local.vehicle)) {
if (!mp.players.local.vehicle.isSeatFree(-1)) //only do this if the vehicle has a driver (doesn't have to be the player who is rendering this)
{
//Optimize function calls to variables (probably doesn't make a difference)

View File

@@ -16,9 +16,9 @@ game.events.onPlayerEnterVehicle(async (vehicle, seat) => {
}
if (vehicle) {
var data: VehicleData = vehicle.getSharedData("VehicleData");
var data: VehicleData = vehicle.getSharedData("VehicleData");
setVehicleData(vehicle, data);
if (vehicle.class == 16) mp.game.vehicle.defaultEngineBehaviour = true;
}
});
@@ -31,8 +31,8 @@ game.events.onPlayerExitVehicle(async () => {
if (veh) {
var data: VehicleData = veh.getSharedData("VehicleData");
setVehicleData(veh, data);
if (veh.class == 16) mp.game.vehicle.defaultEngineBehaviour = false;
}
});