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

Use pickup 0 on GTA3

Browse Source
This commit is contained in:
Vortrex
2021-08-11 09:40:14 -05:00
parent f01b31d133
commit 57368fab7e
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/server/config.js
View File

@@ -210,12 +210,12 @@ function loadGameConfig() {
{}, {},
{ // GTA 3 { // GTA 3
business: 2, business: 0,
house: 2, house: 0,
bank: 2, bank: 0,
clothes: 2, clothes: 0,
info: 2, info: 0,
job: 2, job: 0,
}, },
{ // GTA Vice City { // GTA Vice City
@@ -932,17 +932,17 @@ function initConfigScript() {
logToConsole(LOG_INFO, "[VRR.Config]: Initializing config script ..."); logToConsole(LOG_INFO, "[VRR.Config]: Initializing config script ...");
globalConfig = loadGlobalConfig(); globalConfig = loadGlobalConfig();
gameConfig = loadGameConfig(); gameConfig = loadGameConfig();
serverConfig = loadServerConfigFromGameAndPort(server.game, server.port); serverConfig = loadServerConfigFromGameAndPort(server.game, server.port, getMultiplayerMod());
applyConfigToServer(serverConfig); applyConfigToServer(serverConfig);
logToConsole(LOG_INFO, "[VRR.Config]: Config script initialized!"); logToConsole(LOG_INFO, "[VRR.Config]: Config script initialized!");
} }
// =========================================================================== // ===========================================================================
function loadServerConfigFromGameAndPort(gameId, port) { function loadServerConfigFromGameAndPort(gameId, port, mpMod) {
let dbConnection = connectToDatabase(); let dbConnection = connectToDatabase();
if(dbConnection) { if(dbConnection) {
let dbQueryString = `SELECT * FROM svr_main WHERE svr_game = ${gameId} AND svr_port = ${port} LIMIT 1;`; let dbQueryString = `SELECT * FROM svr_main WHERE svr_game = ${gameId} AND svr_port = ${port} AND svr_mpmod = ${mpMod} LIMIT 1;`;
let dbQuery = queryDatabase(dbConnection, dbQueryString); let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) { if(dbQuery) {
if(dbQuery.numRows > 0) { if(dbQuery.numRows > 0) {
@@ -980,10 +980,13 @@ function loadServerConfigFromId(tempServerId) {
// =========================================================================== // ===========================================================================
function applyConfigToServer(tempServerConfig) { function applyConfigToServer(tempServerConfig) {
gta.time.hour = tempServerConfig.hour; if(isTimeSupported()) {
gta.time.minute = tempServerConfig.minute; setGameTime(tempServerConfig.hour, tempServerConfig.minute, tempServerConfig.minuteDuration)
gta.time.minuteDuration = tempServerConfig.minuteDuration; }
gta.forceWeather(tempServerConfig.weather);
if(isWeatherSupported()) {
gta.forceWeather(tempServerConfig.weather);
}
updateServerRules(); updateServerRules();
} }