diff --git a/SQF/dayz/config/basicDefines.hpp b/SQF/dayz/config/basicDefines.hpp index d415bb69e..aad8c20a5 100644 --- a/SQF/dayz/config/basicDefines.hpp +++ b/SQF/dayz/config/basicDefines.hpp @@ -76,10 +76,6 @@ #define TRACER_N_ALWAYS tracerColor[]=TracerNColorF;tracerColorR[]=TracerNColorF -#define LockNo 0 -#define LockCadet 1 -#define LockYes 2 - enum { DestructNo, diff --git a/SQF/dayz_code/Configs/CfgArma.hpp b/SQF/dayz_code/Configs/CfgArma.hpp index 8d61c2afc..0e9c78ec3 100644 --- a/SQF/dayz_code/Configs/CfgArma.hpp +++ b/SQF/dayz_code/Configs/CfgArma.hpp @@ -1,21 +1,144 @@ + class CfgActions { class None; // External class reference - - class Rearm : None { - show = 0; - }; - class Heal : None { - show = 0; - }; - class HealSoldier : None { - show = 0; - }; - class FirstAid : None { - show = 0; - }; - class TakeBag : None { - show = 0; - }; + class Rearm : None { show = 0; }; + class Heal : None { show = 0; }; + class HealSoldier : None { show = 0; }; + class FirstAid : None { show = 0; }; + class TakeBag : None { show = 0; }; + class Take : None { show = 0; }; + //class LoadMagazine : None { show = 0; }; + //class LoadOtherMagazine : LoadMagazine { show = 0; }; + //class LoadEmptyMagazine : LoadMagazine { show = 0; }; + class FireInflame : None { show = 0; }; + class FirePutDown : None { show = 0; }; + class Repair : None { show = 0; }; + class Refuel : None { show = 0; }; + class TakeWeapon : None { show = 0; }; + //class TakeMagazine : None { show = 0; }; + //class OpenBag : None { show = 0; }; + class PutBag : None { show = 0; }; + class DropBag : None { show = 0; }; + class AddBag : None { show = 0; }; + //class TakeMine : None { show = 0; }; + class DropWeapon : None { show = 0; }; + class PutWeapon : None { show = 0; }; + class DropMagazine : None { show = 0; }; + class PutMagazine : None { show = 0; }; + class DeactivateMine : None { show = 0; }; +/* +"None" +"GetInCommander" +"GetInDriver" +"GetInPilot" +"GetInGunner" +"GetInCargo" +"GetInTurret" +"Heal" +"HealSoldier" +"RepairVehicle" +"FirstAid" +"Repair" +"Refuel" +"Rearm" +"GetOut" +"LightOn" +"LightOff" +"GunLightOn" +"GunLightOff" +"ArtilleryComputer" +"EngineOn" +"EngineOff" +"SwitchWeapon" +"SwitchMagazine" +"HideWeapon" +"UseWeapon" +"LoadMagazine" +"LoadOtherMagazine" +"LoadEmptyMagazine" +"TakeWeapon" +"TakeDropWeapon" +"TakeMagazine" +"TakeDropMagazine" +"TakeFlag" +"ReturnFlag" +"TurnIn" +"TurnOut" +"WeaponInHand" +"WeaponOnBack" +"SitDown" +"Land" +"CancelLand" +"Eject" +"MoveToDriver" +"MoveToPilot" +"MoveToGunner" +"MoveToCommander" +"MoveToCargo" +"MoveToTurret" +"HideBody" +"TouchOff" +"SetTimer" +"StartTimer" +"Deactivate" +"NVGoggles" +"NVGogglesOff" +"ManualFire" +"ManualFireCancel" +"AutoHover" +"AutoHoverCancel" +"StrokeFist" +"StrokeGun" +"LadderUp" +"LadderDown" +"LadderOnDown" +"LadderOnUp" +"LadderOff" +"FireInflame" +"FirePutDown" +"LandGear" +"LandGearUp" +"FlapsDown" +"FlapsUp" +"Salute" +"ScudLaunch" +"ScudStart" +"ScudCancel" +"User" +"DropWeapon" +"PutWeapon" +"DropMagazine" +"PutMagazine" +"UserType" +"HandGunOn" +"HandGunOnStand" +"HandGunOff" +"HandGunOffStand" +"TakeMine" +"DeactivateMine" +"UseMagazine" +"IngameMenu" +"CancelTakeFlag" +"CancelAction" +"MarkEntity" +"MarkWeapon" +"TeamSwitch" +"Gear" +"OpenBag" +"TakeBag" +"PutBag" +"DropBag" +"AddBag" +"IRLaserOn" +"IRLaserOff" +"Assemble" +"DisAssemble" +"Talk" +"Tell" +"Surrender" +"GetOver" +"Take" +*/ }; class CfgLoadingTexts { diff --git a/SQF/dayz_sfx/config.cpp b/SQF/dayz_sfx/config.cpp index 49490d07b..4159069f3 100644 --- a/SQF/dayz_sfx/config.cpp +++ b/SQF/dayz_sfx/config.cpp @@ -20,7 +20,7 @@ class CfgPatches units[] = {}; weapons[] = {}; requiredVersion = 0.1; - requiredAddons[] = {"dayz"}; + requiredAddons[] = {"dayz_anim"}; dayzVersion = 1.8; }; }; @@ -29,7 +29,7 @@ class CfgVehicles { class Sound; class Sound_Generator1: Sound { - scope = 2; + scope = public; sound = "Generator1"; displayName = "Generator"; };