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

Fix some bitflag stuff

Browse Source
This commit is contained in:
Vortrex
2021-11-30 21:51:07 -06:00
parent 4b13a34cd7
commit 07a95f1560
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/server/bitflag.js
View File

@@ -69,7 +69,7 @@ let serverBitFlagKeys = {
"government", "government",
"generic", "generic",
], ],
clanFlagKeys: [ clanTypeFlagKeys: [
"None", "None",
"illegal", "illegal",
"legal", "legal",
@@ -81,7 +81,7 @@ let serverBitFlagKeys = {
"vigilante", "vigilante",
"hitContracts" "hitContracts"
], ],
clanPermissionFlagKeys: [ clanFlagKeys: [
"None", "None",
"StartTurfWar", "StartTurfWar",
"StartPointWar", "StartPointWar",
@@ -226,7 +226,7 @@ function initBitFlagScript() {
serverBitFlags.accountSettingsFlags = createBitFlagTable(serverBitFlagKeys.accountSettingsFlagKeys); serverBitFlags.accountSettingsFlags = createBitFlagTable(serverBitFlagKeys.accountSettingsFlagKeys);
//serverBitFlags.subAccountSettingsFlags = createBitFlagTable(getServerData().subAccountSettingsFlagKeys); //serverBitFlags.subAccountSettingsFlags = createBitFlagTable(getServerData().subAccountSettingsFlagKeys);
serverBitFlags.clanFlags = createBitFlagTable(serverBitFlagKeys.clanFlagKeys); serverBitFlags.clanFlags = createBitFlagTable(serverBitFlagKeys.clanFlagKeys);
serverBitFlags.clanPermissionFlags = createBitFlagTable(serverBitFlagKeys.clanPermissionFlagKeys); serverBitFlags.clanTypeFlagKeys = createBitFlagTable(serverBitFlagKeys.clanTypeFlagKeys);
serverBitFlags.factionFlags = createBitFlagTable(serverBitFlagKeys.factionFlagKeys); serverBitFlags.factionFlags = createBitFlagTable(serverBitFlagKeys.factionFlagKeys);
serverBitFlags.npcTriggerTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerTypeKeys); serverBitFlags.npcTriggerTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerTypeKeys);
serverBitFlags.npcTriggerConditionTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerConditionTypeKeys); serverBitFlags.npcTriggerConditionTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerConditionTypeKeys);
@@ -262,7 +262,10 @@ function hasBitFlag(allFlags, checkForFlag) {
return true; return true;
} }
return ((allFlags & checkForFlag) == allFlags); if(allFlags & checkForFlag == allFlags) {
return true;
}
return false;
} }
// =========================================================================== // ===========================================================================
@@ -330,7 +333,7 @@ function getStaffFlagValue(flagName) {
return -1; return -1;
} }
if(typeof serverBitFlags.staffFlags[flagName] === "undefined") { if(typeof serverBitFlags.staffFlags[flagName] == "undefined") {
return false; return false;
} }
@@ -344,7 +347,7 @@ function getClanFlagValue(flagName) {
return -1; return -1;
} }
if(typeof getServerBitFlags().clanFlags[flagName] === "undefined") { if(typeof getServerBitFlags().clanFlags[flagName] == "undefined") {
return false; return false;
} }
@@ -358,7 +361,7 @@ function getAccountSettingsFlagValue(flagName) {
return -1; return -1;
} }
if(typeof serverBitFlags.accountSettingsFlags[flagName] === "undefined") { if(typeof serverBitFlags.accountSettingsFlags[flagName] == "undefined") {
return false; return false;
} }
@@ -372,7 +375,7 @@ function getModerationFlagValue(flagName) {
return -1; return -1;
} }
if(typeof serverBitFlags.moderationFlags[flagName] === "undefined") { if(typeof serverBitFlags.moderationFlags[flagName] == "undefined") {
return false; return false;
} }