hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use radio utils

Browse Source
This commit is contained in:
Vortrex
2023-02-12 13:11:43 -06:00
parent c168e80258
commit 89118b8426
1 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
scripts/server/radio.js
View File

@@ -77,7 +77,7 @@ function playStreamingRadioCommand(command, params, client) {
let radioStationId = getRadioStationFromParams(params); let radioStationId = getRadioStationFromParams(params);
if (radioStationId != 0 && typeof getServerData().radioStations[radioStationId - 1] == "undefined") { if (getRadioStationData(radioStationId) == -1) {
messagePlayerError(client, getLocaleString(client, "InvalidRadioStation")); messagePlayerError(client, getLocaleString(client, "InvalidRadioStation"));
return false; return false;
} }
@@ -90,7 +90,7 @@ function playStreamingRadioCommand(command, params, client) {
return false; return false;
} }
if (radioStationId == 0) { if (radioStationId == -1) {
getVehicleData(vehicle).streamingRadioStation = -1; getVehicleData(vehicle).streamingRadioStation = -1;
getVehicleData(vehicle).needsSaved = true; getVehicleData(vehicle).needsSaved = true;
getPlayerData(client).streamingRadioStation = -1; getPlayerData(client).streamingRadioStation = -1;
@@ -105,20 +105,20 @@ function playStreamingRadioCommand(command, params, client) {
return false; return false;
} }
getVehicleData(vehicle).streamingRadioStation = radioStationId - 1; getVehicleData(vehicle).streamingRadioStation = radioStationId;
getPlayerData(client).streamingRadioStation = radioStationId - 1; getPlayerData(client).streamingRadioStation = radioStationId;
meActionToNearbyPlayers(client, getLocaleString(client, "ActionVehicleRadioStationChange", getRadioStationData(radioStationId - 1).name, getRadioStationData(radioStationId - 1).genre)); meActionToNearbyPlayers(client, getLocaleString(client, "ActionVehicleRadioStationChange", getRadioStationData(radioStationId).name, getRadioStationData(radioStationId).genre));
let clients = getClients(); let clients = getClients();
for (let i in clients) { for (let i in clients) {
if (vehicle == getPlayerVehicle(clients[i])) { if (vehicle == getPlayerVehicle(clients[i])) {
playRadioStreamForPlayer(clients[i], getRadioStationData(radioStationId - 1).url, true, getPlayerStreamingRadioVolume(client)); playRadioStreamForPlayer(clients[i], getRadioStationData(radioStationId).url, true, getPlayerStreamingRadioVolume(client));
} }
} }
} else { } else {
if (isPlayerInAnyHouse(client)) { if (isPlayerInAnyHouse(client)) {
let houseId = getPlayerHouse(client); let houseId = getPlayerHouse(client);
if (radioStationId == 0) { if (radioStationId == -1) {
getHouseData(houseId).streamingRadioStationIndex = -1; getHouseData(houseId).streamingRadioStationIndex = -1;
getHouseData(houseId).streamingRadioStationIndex = 0; getHouseData(houseId).streamingRadioStationIndex = 0;
getHouseData(houseId).needsSaved = true; getHouseData(houseId).needsSaved = true;
@@ -132,22 +132,22 @@ function playStreamingRadioCommand(command, params, client) {
} }
} }
} else { } else {
getHouseData(houseId).streamingRadioStationIndex = radioStationId - 1; getHouseData(houseId).streamingRadioStationIndex = radioStationId;
getHouseData(houseId).streamingRadioStation = getRadioStationData(radioStationId - 1).databaseId; getHouseData(houseId).streamingRadioStation = getRadioStationData(radioStationId).databaseId;
getHouseData(houseId).needsSaved = true; getHouseData(houseId).needsSaved = true;
getPlayerData(client).streamingRadioStation = radioStationId - 1; getPlayerData(client).streamingRadioStation = radioStationId;
meActionToNearbyPlayers(client, getLocaleString(client, "ActionHouseRadioStationChange", getRadioStationData(radioStationId - 1).name, getRadioStationData(radioStationId - 1).genre)); meActionToNearbyPlayers(client, getLocaleString(client, "ActionHouseRadioStationChange", getRadioStationData(radioStationId).name, getRadioStationData(radioStationId).genre));
let clients = getClients(); let clients = getClients();
for (let i in clients) { for (let i in clients) {
if (getEntityData(clients[i], "v.rp.inHouse") == houseId) { if (getEntityData(clients[i], "v.rp.inHouse") == houseId) {
playRadioStreamForPlayer(clients[i], getRadioStationData(radioStationId - 1).url, true, getPlayerStreamingRadioVolume(clients[i])); playRadioStreamForPlayer(clients[i], getRadioStationData(radioStationId).url, true, getPlayerStreamingRadioVolume(clients[i]));
} }
} }
} }
} else if (isPlayerInAnyBusiness(client)) { } else if (isPlayerInAnyBusiness(client)) {
let businessId = getPlayerBusiness(client); let businessId = getPlayerBusiness(client);
if (radioStationId == 0) { if (radioStationId == -1) {
getBusinessData(businessId).streamingRadioStation = 0; getBusinessData(businessId).streamingRadioStation = 0;
getBusinessData(businessId).streamingRadioStationIndex = -1; getBusinessData(businessId).streamingRadioStationIndex = -1;
getBusinessData(businessId).needsSaved = true; getBusinessData(businessId).needsSaved = true;
@@ -161,16 +161,16 @@ function playStreamingRadioCommand(command, params, client) {
} }
} }
} else { } else {
getBusinessData(businessId).streamingRadioStationIndex = radioStationId - 1; getBusinessData(businessId).streamingRadioStationIndex = radioStationId;
getBusinessData(businessId).streamingRadioStation = getRadioStationData(radioStationId - 1).databaseId; getBusinessData(businessId).streamingRadioStation = getRadioStationData(radioStationId).databaseId;
getBusinessData(businessId).needsSaved = true; getBusinessData(businessId).needsSaved = true;
getPlayerData(client).streamingRadioStation = radioStationId - 1; getPlayerData(client).streamingRadioStation = radioStationId;
meActionToNearbyPlayers(client, getLocaleString(client, "ActionBusinessRadioStationChange", getRadioStationData(radioStationId - 1).name, getRadioStationData(radioStationId - 1).genre)); meActionToNearbyPlayers(client, getLocaleString(client, "ActionBusinessRadioStationChange", getRadioStationData(radioStationId).name, getRadioStationData(radioStationId).genre));
let clients = getClients(); let clients = getClients();
for (let i in clients) { for (let i in clients) {
if (getPlayerBusiness(clients[i]) == businessId) { if (getPlayerBusiness(clients[i]) == businessId) {
playRadioStreamForPlayer(clients[i], getRadioStationData(radioStationId - 1).url, true, getPlayerStreamingRadioVolume(clients[i])); playRadioStreamForPlayer(clients[i], getRadioStationData(radioStationId).url, true, getPlayerStreamingRadioVolume(clients[i]));
} }
} }
} }
@@ -263,16 +263,6 @@ function setAllRadioStationIndexes() {
// =========================================================================== // ===========================================================================
/**
* @param {number} radioStationId - The data index of the radio station
* @return {RadioStationData} The radio station's data (class instance)
*/
function getRadioStationData(radioStationId) {
return getServerData().radioStations[radioStationId];
}
// ===========================================================================
/** /**
* This is a command handler function. * This is a command handler function.
* *
@@ -301,12 +291,12 @@ function getRadioStationFromParams(params) {
} }
} }
} else { } else {
if (typeof getServerData().radioStations[params] != "undefined") { if (typeof getServerData().radioStations[params - 1] != "undefined") {
return toInteger(params); return toInteger(params - 1);
} }
} }
return false; return -1;
} }
// =========================================================================== // ===========================================================================