Fix Merge Problems

Use CString Macro
This commit is contained in:
Joko 2015-07-01 03:03:51 +02:00
parent 737753fbab
commit 30111b4f15

View File

@ -12,9 +12,35 @@ class CfgVehicles {
backpack = "ACE_NonSteerableParachute"; backpack = "ACE_NonSteerableParachute";
count = 4; count = 4;
}; };
class _xx_ACE_ReserveParachute {
backpack = "ACE_ReserveParachute";
count = 4;
};
}; };
}; };
class Man;
class CAManBase: Man {
class ACE_SelfActions {
class ACE_CutParachute {
displayName = CSTRING("CutParachute");
exceptions[] = {"isNotInside"};
condition = QUOTE([_player] call FUNC(checkCutParachute));
statement = QUOTE([_player] call FUNC(cutParachute));
showDisabled = 0;
priority = 2.9;
icon = QUOTE(PATHTOF(UI\cut_ca.paa));
hotkey = "C"; // Did this realy Work?
};
};
};
class Helicopter;
class ParachuteBase: Helicopter {
ace_hasReserveParachute = 1;
ace_reserveParachute = "ACE_ReserveParachute";
};
class B_Parachute; class B_Parachute;
class ACE_NonSteerableParachute: B_Parachute { class ACE_NonSteerableParachute: B_Parachute {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
@ -28,6 +54,16 @@ class CfgVehicles {
mass = 100; mass = 100;
}; };
class ACE_ReserveParachute: ACE_NonSteerableParachute {
author = ECSTRING(common,ACETeam);
displayName = CSTRING(ReserveParachute);
scope = 2;
mass = 70;
ParachuteClass = "NonSteerable_Parachute_F";
ace_reserveParachute = "";
ace_hasReserveParachute = 0;
};
class B_Soldier_05_f; class B_Pilot_F: B_Soldier_05_f {backpack = "ACE_NonSteerableParachute";}; class B_Soldier_05_f; class B_Pilot_F: B_Soldier_05_f {backpack = "ACE_NonSteerableParachute";};
class I_Soldier_04_F; class I_pilot_F: I_Soldier_04_F {backpack = "ACE_NonSteerableParachute";}; class I_Soldier_04_F; class I_pilot_F: I_Soldier_04_F {backpack = "ACE_NonSteerableParachute";};
class O_helipilot_F; class O_Pilot_F: O_helipilot_F {backpack = "ACE_NonSteerableParachute";}; class O_helipilot_F; class O_Pilot_F: O_helipilot_F {backpack = "ACE_NonSteerableParachute";};