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

Move game ID util to natives + use db config util

Browse Source
This commit is contained in:
Vortrex
2022-04-26 10:18:15 -05:00
parent 0e82417d8d
commit 0e3b30725f
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/client/native/connected.js
View File

@@ -212,4 +212,10 @@ function getPlayerName(client) {
return client.name; return client.name;
} }
// ===========================================================================
function getGame() {
return game.game;
}
// =========================================================================== // ===========================================================================

21
scripts/server/native/connected.js
View File

@@ -748,10 +748,10 @@ function getPlayerWeapon(client) {
// =========================================================================== // ===========================================================================
function connectToDatabase() { function connectToDatabase() {
if(databaseConfig.usePersistentConnection) { if(getDatabaseConfig().usePersistentConnection) {
if(persistentDatabaseConnection == null) { if(persistentDatabaseConnection == null) {
logToConsole(LOG_DEBUG, "[VRR.Database] Initializing database connection ..."); logToConsole(LOG_DEBUG, "[VRR.Database] Initializing database connection ...");
persistentDatabaseConnection = module.mysql.connect(databaseConfig.host, databaseConfig.user, databaseConfig.pass, databaseConfig.name, databaseConfig.port); persistentDatabaseConnection = module.mysql.connect(getDatabaseConfig().host, getDatabaseConfig().user, getDatabaseConfig().pass, getDatabaseConfig().name, getDatabaseConfig().port);
if(persistentDatabaseConnection.error) { if(persistentDatabaseConnection.error) {
console.warn("[VRR.Database] Database connection error: " + toString(persistentDatabaseConnection.error)); console.warn("[VRR.Database] Database connection error: " + toString(persistentDatabaseConnection.error));
persistentDatabaseConnection = null; persistentDatabaseConnection = null;
@@ -765,7 +765,7 @@ function connectToDatabase() {
return persistentDatabaseConnection; return persistentDatabaseConnection;
} }
} else { } else {
let databaseConnection = module.mysql.connect(databaseConfig.host, databaseConfig.user, databaseConfig.pass, databaseConfig.name, databaseConfig.port); let databaseConnection = module.mysql.connect(getDatabaseConfig().host, getDatabaseConfig().user, getDatabaseConfig().pass, getDatabaseConfig().name, getDatabaseConfig().port);
if(databaseConnection.error) { if(databaseConnection.error) {
console.warn("[VRR.Database] Database connection error: " + toString(persistentDatabaseConnection.error)); console.warn("[VRR.Database] Database connection error: " + toString(persistentDatabaseConnection.error));
return false; return false;
@@ -778,7 +778,7 @@ function connectToDatabase() {
// =========================================================================== // ===========================================================================
function disconnectFromDatabase(dbConnection) { function disconnectFromDatabase(dbConnection) {
if(!databaseConfig.usePersistentConnection) { if(!getDatabaseConfig().usePersistentConnection) {
try { try {
dbConnection.close(); dbConnection.close();
logToConsole(LOG_DEBUG, `[VRR.Database] Database connection closed successfully`); logToConsole(LOG_DEBUG, `[VRR.Database] Database connection closed successfully`);
@@ -921,13 +921,6 @@ function setConstantsAsGlobalVariablesInDatabase() {
// =========================================================================== // ===========================================================================
function loadDatabaseConfiguration() {
let databaseConfigFile = loadTextFile("config/database.json");
return JSON.parse(databaseConfigFile);
}
// ===========================================================================
function createDatabaseInsertQuery(tableName, data) { function createDatabaseInsertQuery(tableName, data) {
let fields = []; let fields = [];
let values = []; let values = [];
@@ -1202,4 +1195,10 @@ function despawnPlayer(client) {
client.despawnPlayer(); client.despawnPlayer();
} }
// ===========================================================================
function getGame() {
return server.game;
}
// =========================================================================== // ===========================================================================