Merge branch 'master' into nightly

This commit is contained in:
Vortrex
2022-04-28 12:05:56 -05:00
8 changed files with 528 additions and 152 deletions

View File

@@ -364,6 +364,8 @@ function setLocalPlayerInterior(interior) {
natives.activateInterior(interiorId, true);
natives.loadAllObjectsNow();
}
let interiorId = natives.getInteriorAtCoords(localPlayer.position);
natives.activateInterior(interiorId, true);
}
}
@@ -400,6 +402,15 @@ function isSnowEnabled() {
// ===========================================================================
function playPedSpeech(pedName, speechId) {
logToConsole(LOG_DEBUG, `[VRR.Utilities] Making ${pedName}'s ped talk (${speechId})`);
if(getMultiplayerMod() == VRR_MPMOD_GTAC) {
game.SET_CHAR_SAY(int, int);
}
}
// ===========================================================================
function clearLocalPedState() {
logToConsole(LOG_DEBUG, `[VRR.Utilities] Clearing local ped state`);
localPlayer.clearObjective();
@@ -809,6 +820,7 @@ function setVehiclePurchaseState(state, vehicleId, position) {
// ===========================================================================
function processVehicleFires() {
/*
let vehicles = getElementsByType(ELEMENT_VEHICLE);
for(let i in vehicles) {
if(vehicles[i].isSyncer) {
@@ -819,6 +831,7 @@ function processVehicleFires() {
}
}
}
*/
}
// ===========================================================================