Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (#5463)

Browse Source 
Cleanup some configs and array spacing
This commit is contained in:
Neviothr 2017-08-30 01:47:01 +03:00 committed by PabstMirror
parent 5ca113d0ba
commit abc91f1564
15 changed files with 80 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/fonts/CfgFontFamilies.hpp
View File

@ -1,7 +1,5 @@
class CfgFontFamilies class CfgFontFamilies {
{ class PixelSplitterBold {
class PixelSplitterBold
{
fonts[] = { QPATHTOF(PixelSplitterBold\PixelSplitterBold6), fonts[] = { QPATHTOF(PixelSplitterBold\PixelSplitterBold6),
QPATHTOF(PixelSplitterBold\PixelSplitterBold7), QPATHTOF(PixelSplitterBold\PixelSplitterBold7),
QPATHTOF(PixelSplitterBold\PixelSplitterBold8), QPATHTOF(PixelSplitterBold\PixelSplitterBold8),

1
addons/noidle/CfgMoves.hpp
View File

@ -1,4 +1,3 @@
class CfgMovesBasic { class CfgMovesBasic {
class StandBase; class StandBase;
}; };

1
addons/noradio/CfgEventhandlers.hpp
View File

@ -1,4 +1,3 @@
class Extended_PostInit_EventHandlers { class Extended_PostInit_EventHandlers {
class ADDON { class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_postInit)); init = QUOTE(call COMPILE_FILE(XEH_postInit));

10
addons/noradio/XEH_postInit.sqf
View File

@ -1,7 +1,7 @@
// by commy2 // By commy2
#include "script_component.hpp" #include "script_component.hpp"
// unmute unit if that player disconnects // Unmute unit if that player disconnects
if (isServer) then { if (isServer) then {
addMissionEventHandler ["HandleDisconnect", { addMissionEventHandler ["HandleDisconnect", {
[_this select 0, "isPlayer"] call EFUNC(common,unmuteUnit); [_this select 0, "isPlayer"] call EFUNC(common,unmuteUnit);
@ -15,14 +15,14 @@ if (!isNull ace_player) then {
[ace_player, "isPlayer"] call EFUNC(common,muteUnit); [ace_player, "isPlayer"] call EFUNC(common,muteUnit);
}; };
// mutes/unmutes units when the player changes // Mutes/unmutes units when the player changes
["unit", { ["unit", {
params ["_newPlayer", "_oldPlayer"]; params ["_newPlayer", "_oldPlayer"];
// mute the new player // Mute the new player
[_newPlayer, "isPlayer"] call EFUNC(common,muteUnit); [_newPlayer, "isPlayer"] call EFUNC(common,muteUnit);
// unmute the old player // Unmute the old player
if (alive _oldPlayer) then { if (alive _oldPlayer) then {
[_oldPlayer, "isPlayer"] call EFUNC(common,unmuteUnit); [_oldPlayer, "isPlayer"] call EFUNC(common,unmuteUnit);
}; };

1
addons/norearm/CfgActions.hpp
View File

@ -1,4 +1,3 @@
class CfgActions { class CfgActions {
class None; class None;
class Rearm: None { class Rearm: None {

1
addons/optics/CfgEventHandlers.hpp
View File

@ -1,4 +1,3 @@
class Extended_PreStart_EventHandlers { class Extended_PreStart_EventHandlers {
class ADDON { class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preStart)); init = QUOTE(call COMPILE_FILE(XEH_preStart));

6
addons/optics/CfgRscTitles.hpp
View File

@ -11,7 +11,7 @@ class RscInGameUI {
class ACE_RscWeaponZeroing: RscWeaponZeroing { class ACE_RscWeaponZeroing: RscWeaponZeroing {
controls[] = {"CA_Zeroing", "CA_FOVMode", "ACE_DrawReticleHelper", "ACE_ScriptedReticle"}; controls[] = {"CA_Zeroing", "CA_FOVMode", "ACE_DrawReticleHelper", "ACE_ScriptedReticle"};
class CA_FOVMode: RscOpticsValue { // idea by Taosenai. Apparently this can be used via isNil check to determine wheter the scope or the kolimator is used class CA_FOVMode: RscOpticsValue { // Idea by Taosenai. Apparently this can be used via isNil check to determine wheter the scope or the kolimator is used
idc = 154; idc = 154;
style = 2; style = 2;
colorText[] = {0, 0, 0, 0}; colorText[] = {0, 0, 0, 0};
@ -40,9 +40,9 @@ class RscInGameUI {
}; };
class ACE_RscWeapon_base: RscWeaponZeroing { class ACE_RscWeapon_base: RscWeaponZeroing {
controls[] = {"CA_Zeroing","CA_FOVMode","ACE_DrawReticleHelper","ReticleDay","ReticleNight","BodyNight","BodyDay", "trippleHeadLeft", "trippleHeadRight"}; // don't change this order controls[] = {"CA_Zeroing", "CA_FOVMode", "ACE_DrawReticleHelper", "ReticleDay", "ReticleNight", "BodyNight", "BodyDay", "trippleHeadLeft", "trippleHeadRight"}; // Don't change this order
class CA_FOVMode: RscOpticsValue { // idea by Taosenai. Apparently this can be used via isNil check to determine wheter the scope or the kolimator is used class CA_FOVMode: RscOpticsValue { // Idea by Taosenai. Apparently this can be used via isNil check to determine wheter the scope or the kolimator is used
idc = 154; idc = 154;
style = 2; style = 2;
colorText[] = {0, 0, 0, 0}; colorText[] = {0, 0, 0, 0};

1
addons/optics/XEH_PREP.hpp
View File

@ -1,4 +1,3 @@
PREP(handleFired); PREP(handleFired);
PREP(onDrawScope); PREP(onDrawScope);
PREP(onDrawScope2D); PREP(onDrawScope2D);

2
addons/optics/functions/fnc_handleFired.sqf
View File

@ -23,7 +23,7 @@ TRACE_10("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectil
disableSerialization; disableSerialization;
// check if compatible scope is used // Check if compatible scope is used
private _display = uiNamespace getVariable [QGVAR(RscWeaponInfo2D), displayNull]; private _display = uiNamespace getVariable [QGVAR(RscWeaponInfo2D), displayNull];
if (isNull _display) exitWith {}; if (isNull _display) exitWith {};

2
addons/optics/functions/fnc_onDrawScope2D.sqf
View File

@ -78,7 +78,7 @@ if (_isPIP) then {
}; };
}; };
// calculate lighting // Calculate lighting
private _dayOpacity = call EFUNC(common,ambientBrightness); private _dayOpacity = call EFUNC(common,ambientBrightness);
private _nightOpacity = [1, 0] select (_dayOpacity == 1); private _nightOpacity = [1, 0] select (_dayOpacity == 1);