Use non-ex events for Mafia 1

This commit is contained in:
Vortrex
2023-02-08 17:59:34 -06:00
parent dd04ec0bb3
commit 07187b99ce

View File

@@ -32,17 +32,21 @@ function addAllEventHandlers() {
addEventHandler("OnMouseWheel", onMouseWheel); addEventHandler("OnMouseWheel", onMouseWheel);
addEventHandler("OnEntityProcess", onEntityProcess); addEventHandler("OnEntityProcess", onEntityProcess);
if (findResourceByName("v-events") != null) { if (getGame() <= V_GAME_GTA_SA) {
if (findResourceByName("v-events").isStarted) { if (findResourceByName("v-events") != null) {
addEventHandler("OnPedEnteredVehicleEx", onPedEnteredVehicle); if (findResourceByName("v-events").isStarted) {
addEventHandler("OnPedExitedVehicleEx", onPedExitedVehicle); addEventHandler("OnPedEnteredVehicleEx", onPedEnteredVehicle);
addEventHandler("OnPedEnteredSphereEx", onPedEnteredSphere); addEventHandler("OnPedExitedVehicleEx", onPedExitedVehicle);
addEventHandler("OnPedExitedSphereEx", onPedExitedSphere); addEventHandler("OnPedEnteredSphereEx", onPedEnteredSphere);
addEventHandler("OnPedExitedSphereEx", onPedExitedSphere);
}
} }
} }
if (getGame() == V_GAME_MAFIA_ONE) { if (getGame() == V_GAME_MAFIA_ONE) {
addEventHandler("OnMapLoaded", onMapLoaded); addEventHandler("OnMapLoaded", onMapLoaded);
addEventHandler("OnPedEnteredVehicle", onPedEnteredVehicle);
addEventHandler("OnPedExitedVehicle", onPedExitedVehicle);
} }
} }
@@ -56,10 +60,16 @@ function onResourceStart(event, resource) {
removeEventHandler("OnPedEnteredSphereEx"); removeEventHandler("OnPedEnteredSphereEx");
removeEventHandler("OnPedExitedSphereEx"); removeEventHandler("OnPedExitedSphereEx");
addEventHandler("OnPedEnteredVehicleEx", onPedEnteredVehicle); if (getGame() <= V_GAME_GTA_SA) {
addEventHandler("OnPedExitedVehicleEx", onPedExitedVehicle); if (findResourceByName("v-events") != null) {
addEventHandler("OnPedEnteredSphereEx", onPedEnteredSphere); if (findResourceByName("v-events").isStarted) {
addEventHandler("OnPedExitedSphereEx", onPedExitedSphere); addEventHandler("OnPedEnteredVehicleEx", onPedEnteredVehicle);
addEventHandler("OnPedExitedVehicleEx", onPedExitedVehicle);
addEventHandler("OnPedEnteredSphereEx", onPedEnteredSphere);
addEventHandler("OnPedExitedSphereEx", onPedExitedSphere);
}
}
}
} }
if (resource == thisResource) { if (resource == thisResource) {