Skip to content

Commit

Permalink
#3 hotFix encoding fuckup functions.h iso8859-1
Browse files Browse the repository at this point in the history
  • Loading branch information
PaxJaromeMalues committed Dec 5, 2022
1 parent 73d6597 commit f574f48
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 32 deletions.
33 changes: 33 additions & 0 deletions fncs/sideMarkers/hideMarkers.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
Author: unkown (Armaholic ~2014) Editor: Pax_Jarome
Locality:
local execution
local effect
Desc:
At mission start the script will gather all placed
markers including hidden ones and perform a search
based on the markers variableObjectName given in the
editor. If the variableObjectName starts with any of
the BIS provided sides west,east,resistance,civilian
the script will "hide" (setMarkerAlphaLocal) the marker
based on the players playerSide.
This script will not accept parameters.
This script does not return any values.
*/

{
_x setMarkerAlphaLocal 0
} count (
allMapMarkers select {
private _marker = _x;
!(
[
west,east,resistance,civilian
] select {
_marker find toLower str _x != -1
} isEqualTo []
) && {
_x find toLower str playerSide == -1
}
}
);
27 changes: 6 additions & 21 deletions functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,13 @@ DEC(core,infoText)
DEC(core,parse3denArray)
DEC(core,parseAnyControlType)


// D Y N A M I C V I E W D I S T A N C E
/* Dynamic TerrainGrid */
DEC(dynamicViewDistance,handleTerrainGrid)
DEC(dynamicViewDistance,checkForceList)
DEC(dynamicViewDistance,openDialog)
DEC(dynamicViewDistance,updateViewdistance)



// A C R E
/* ACRE Init */
DEC(acre,acreInit)
Expand All @@ -40,8 +37,6 @@ DEC(acre,babelSetup)
/* ACRE Funkgerätvergabe */
DEC(acre,autoRadios)



// T E L E P O R T
/* Teleportdialog öffnen */
DEC(teleport,openDialog)
Expand All @@ -55,13 +50,10 @@ DEC(teleport,addAction)
/* Fügt die Aktion für JIPler hinzu */
DEC(teleport,addActionJIP)



// InitBlackScreen
/* InitBlackScreen */
DEC(initBlackScreen,initBlackScreen)


// EasySpawn
/* EasySpawn */
DEC(easySpawn,extractCrewInfo)
DEC(easySpawn,extractUnitInfo)
DEC(easySpawn,getTemplateData)
Expand All @@ -70,8 +62,7 @@ DEC(easySpawn,spawnGroup)
DEC(easySpawn,spawnUnit)
DEC(easySpawn,spawnVehicle)


// PvPGameMode
/* PvPGameMode */
DEC(pvp,claimTargetObject)
DEC(pvp,clientTracking)
DEC(pvp,getSideColor)
Expand All @@ -80,13 +71,9 @@ DEC(pvp,initTargetObject)
DEC(pvp,serverLoop)
DEC(pvp,serverLoopInit)


/* Zone Restriction */
DEC(zoneRestriction,main)




/* HABO - Help A Brother Out */
DEC(habo,addGroupToMetaGroup)
DEC(habo,calculateCombatRating)
Expand All @@ -113,24 +100,22 @@ DEC(habo,setMetaGroupMaxDistance)
DEC(habo,setMetaGroupType)
DEC(habo,updateMetaGroupState)


/* Buildpop - Building Population */
DEC(buildPop,init3denTriggers)
DEC(buildPop,initBuildPopTrigger)
DEC(buildPop,populateBuilding)



/* Module functions */
DEC(modules,easySpawnSetGroupTemplate)
DEC(modules,easySpawnSpawnGroup)
DEC(modules,haboRegisterGroups)
DEC(modules,buildPopModuleInit)



/* Anticheat */
DEC(antiCheat,clientSendInfoToServer)
DEC(antiCheat,initWhiteList)
DEC(antiCheat,onDifferenceDetection)
DEC(antiCheat,serverReceiveStringFromClient)

/* sideMarkers - side senitive map marker hiding */
DEC(sideMarkers,hideMarkers)
15 changes: 4 additions & 11 deletions missionsErweiterungen/initPlayerLocal.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ if (RR_commons_viewdistance) then {
private _vdActionID = player addAction["<t color='#FF0000'>Sichtweite</t>",RR_commons_dynamicViewDistance_fnc_openDialog,[],-99,false,false,"",''];
};



/* ACRE */
if (isNil "RR_commons_acre_babel_bluforLanguage") then {RR_commons_acre_babel_bluforLanguage = "BLUFOR-Sprache"};
if (isNil "RR_commons_acre_babel_redforLanguage") then {RR_commons_acre_babel_redforLanguage = "REDFOR-Sprache"};
Expand All @@ -25,7 +23,6 @@ if (isNil "RR_commons_acre_babel_civilLanguage") then {RR_commons_acre_babel_ci
call RR_commons_acre_fnc_babelSetup;
call RR_commons_acre_fnc_autoRadios;


/* Teleporter */
RR_commons_teleport_canTeleport = true;
if (RR_commons_teleport) then {
Expand All @@ -39,19 +36,16 @@ if (RR_commons_teleport) then {
};
};


/* Init Blackscreen */
if (isNil "RR_commons_initBlackScreen_time") then {RR_commons_initBlackScreen_time = 12};
if (isNil "RR_commons_initBlackScreen_text") then {RR_commons_initBlackScreen_text = "Mission wird initialisiert"};
if (RR_commons_initBlackScreen) then {[] spawn RR_commons_initBlackScreen_fnc_initBlackScreen};


/* Artilleriecomputer */
if !(RR_commons_artilleryComp) then {
enableEngineArtillery false;
};


/* Zonerestriction */
if (isNil "RR_commons_zoneRestriction_warningTime") then {RR_commons_zoneRestriction_warningTime = 10};
if (isNil "RR_commons_zoneRestriction_mode") then {RR_commons_zoneRestriction_mode = 0};
Expand All @@ -64,7 +58,6 @@ RR_commons_zoneRestriction_triggers = RR_commons_zoneRestriction_triggers ap
RR_commons_zoneRestriction_excludeArray = RR_commons_zoneRestriction_excludeArray apply {call compile _x};
RR_commons_lastVDChange = 0;


/* Anti Cheat */
if (isMultiplayer) then {
[] spawn {
Expand All @@ -74,9 +67,6 @@ if (isMultiplayer) then {
};
};




/* Persistence */
if (RR_commons_persistence) then {
if (isNil "RR_commons_persistence_customSaveFunction") then {RR_commons_persistence_customSaveFunction = ""};
Expand All @@ -98,4 +88,7 @@ if (RR_commons_persistence) then {
RR_commons_zoneRestriction_nextCheck = _currentTime + 0.5;
};
clearRadio
}, 0] call CBA_fnc_addPerFrameHandler;
}, 0] call CBA_fnc_addPerFrameHandler;

/* hide side specific map markers */
[] call RR_commons_sideMarkers_fnc_hideMarkers;

0 comments on commit f574f48

Please sign in to comment.