diff --git a/scripts/client/startup.js b/scripts/client/startup.js index bd38327f..76cd14a7 100644 --- a/scripts/client/startup.js +++ b/scripts/client/startup.js @@ -151,6 +151,11 @@ function setUpInitialGame() { natives.switchAmbientPlanes(true); natives.switchMadDrivers(false); + // Singleplayer Cellphone + natives.requestScript("spcellphone"); + natives.startNewScript("spcellphone", 0); + //natives.setMessagesWaiting(false); + natives.requestAnims("DANCING"); return true; } diff --git a/scripts/client/sync.js b/scripts/client/sync.js index 3a2a3704..34a5e7b3 100644 --- a/scripts/client/sync.js +++ b/scripts/client/sync.js @@ -10,8 +10,8 @@ function processSync(event, deltaTime) { if(localPlayer != null) { if(!areServerElementsSupported()) { - sendNetworkEventToServer("vrr.plr.pos", localPlayer.position); - sendNetworkEventToServer("vrr.plr.rot", localPlayer.heading); + sendNetworkEventToServer("vrr.plr.pos", (localPlayer.vehicle != null) ? localPlayer.vehicle.position : localPlayer.position); + sendNetworkEventToServer("vrr.plr.rot", (localPlayer.vehicle != null) ? localPlayer.vehicle.heading : localPlayer.heading); //if(localPlayer.vehicle != null) { // sendNetworkEventToServer("vrr.veh.pos", getVehicleForNetworkEvent(localPlayer.vehicle), localPlayer.vehicle.position); diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js index 6c6a7393..2e5047bc 100644 --- a/scripts/server/native/connected.js +++ b/scripts/server/native/connected.js @@ -150,6 +150,9 @@ function getVehicleHeading(vehicle) { // =========================================================================== function setVehicleHeading(vehicle, heading) { + if(getGame() == VRR_GAME_GTA_IV) { + return sendNetworkEventToPlayer("vrr.vehPosition", null, getVehicleForNetworkEvent(vehicle), heading); + } return vehicle.heading = heading; } @@ -162,7 +165,13 @@ function getVehicleSyncer(vehicle) { // =========================================================================== function getVehicleForNetworkEvent(vehicle) { - return vehicle; + if(getGame() == VRR_GAME_GTA_IV) { + if(getVehicleData(vehicle).ivNetworkId != -1) { + return getVehicleData(vehicle).ivNetworkId; + } + return -1; + } + return vehicle.id; } // ===========================================================================