From c5a42d1187bc021f0ad16302b941f7b2343ac529 Mon Sep 17 00:00:00 2001 From: jodav Date: Mon, 12 Jan 2015 10:07:03 +0100 Subject: [PATCH 01/15] preCBA --- .../UI/Icon_Module_FriendlyFire_ca.paa | Bin 0 -> 5625 bytes .../respawn/UI/Icon_Module_Rallypoint_ca.paa | Bin 0 -> 5625 bytes addons/respawn/UI/Icon_Module_Respawn_ca.paa | Bin 0 -> 5625 bytes addons/respawn/config.cpp | 281 ++++++++++++++++++ .../functions/fn_canMoveRallypoint.sqf | 14 + addons/respawn/functions/fn_getAllGear.sqf | 40 +++ addons/respawn/functions/fn_handleKilled.sqf | 31 ++ addons/respawn/functions/fn_handleRespawn.sqf | 25 ++ .../respawn/functions/fn_initRallypoint.sqf | 17 ++ addons/respawn/functions/fn_module.sqf | 43 +++ .../functions/fn_moduleFriendlyFire.sqf | 28 ++ .../respawn/functions/fn_moduleRallypoint.sqf | 25 ++ .../respawn/functions/fn_moveRallypoint.sqf | 35 +++ addons/respawn/functions/fn_removeBody.sqf | 30 ++ .../functions/fn_removeDisconnectedPlayer.sqf | 15 + addons/respawn/functions/fn_restoreGear.sqf | 145 +++++++++ .../functions/fn_showFriendlyFireMessage.sqf | 12 + .../functions/fn_teleportToRallypoint.sqf | 27 ++ 18 files changed, 768 insertions(+) create mode 100644 addons/respawn/UI/Icon_Module_FriendlyFire_ca.paa create mode 100644 addons/respawn/UI/Icon_Module_Rallypoint_ca.paa create mode 100644 addons/respawn/UI/Icon_Module_Respawn_ca.paa create mode 100644 addons/respawn/config.cpp create mode 100644 addons/respawn/functions/fn_canMoveRallypoint.sqf create mode 100644 addons/respawn/functions/fn_getAllGear.sqf create mode 100644 addons/respawn/functions/fn_handleKilled.sqf create mode 100644 addons/respawn/functions/fn_handleRespawn.sqf create mode 100644 addons/respawn/functions/fn_initRallypoint.sqf create mode 100644 addons/respawn/functions/fn_module.sqf create mode 100644 addons/respawn/functions/fn_moduleFriendlyFire.sqf create mode 100644 addons/respawn/functions/fn_moduleRallypoint.sqf create mode 100644 addons/respawn/functions/fn_moveRallypoint.sqf create mode 100644 addons/respawn/functions/fn_removeBody.sqf create mode 100644 addons/respawn/functions/fn_removeDisconnectedPlayer.sqf create mode 100644 addons/respawn/functions/fn_restoreGear.sqf create mode 100644 addons/respawn/functions/fn_showFriendlyFireMessage.sqf create mode 100644 addons/respawn/functions/fn_teleportToRallypoint.sqf diff --git a/addons/respawn/UI/Icon_Module_FriendlyFire_ca.paa b/addons/respawn/UI/Icon_Module_FriendlyFire_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..200d02732c53ae2c43bebcd292d5e195ef3fe6b8 GIT binary patch literal 5625 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 E2Y@s_MF0Q* literal 0 HcmV?d00001 diff --git a/addons/respawn/UI/Icon_Module_Rallypoint_ca.paa b/addons/respawn/UI/Icon_Module_Rallypoint_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..ef6ce002c4af752f1791a57328fcb815e65df842 GIT binary patch literal 5625 zcmds53v3fd8Xl7r2u&d2QK^{V#8~7+4+^!qY6Y#GJCm48lafM#(1&nB>5JH?tpazI zo1|&$qN19ny>d}YEg^B74yl(QcWD*%oL;VAg+Nf~!;VRs(A1#;Cr(XVyXXkLYWzX7Q)#Cq~;y%0Ql`$JPH< z;F56EHpE+)T>UrFGj6*A{mTYw!}Oju8oO?QFAdBQW&r-B^FjD6OKPkWz~46Jv_R6iA^{jritz__OssxbdP+V{C0o+UGi*DTqivaKL zC2}u*o8b|HU(IFx^;F+{h>9h9yQzNJ%PgM~zge1Il3ag0W)s3IRzv@iK|E%lfHdka zi6<-2V)p?~m5=gJ)H-y+#>QJ6#}QX;nB_BheD%G3mlo~m>;ismr&Dad@6(fj^{q8l zAy{=kVAQF~LnwpgOS}7n>Oh9T^i8cX=g^+l<@wyJ+ErK(W9#F?Bd4)=QbXya_;jY0 zoIp!1n}6zfybF6}|I0%z(Pt2t|Ec2VnkJlBa1r(d|5~>}2slMQ;GDnn)h{aMhiT-G zaa^#ACtRol5&F&L6Tw@&t%r#+AgX0Fksp4-7$GWgo;*;~Igaq%f zv;3ygPbJrziYfzSii1Bnzwml7y@UkMTUq_K#qpR6U%m18BiMxnc|FN2Id1onDFpte ziZ5Bd`rPzO!kJMv-}iTBj8QJyXy2@XdBTwdl<={y`K*U=!~^nVzEpU+nX_IZB@Fr` zenJ-408XWUZxgAXm^6JPf7ZH5@E)=KM)j}b@Af(ca)Ev#YWaM19q#^l=OMG31Ru3A zd-pbx^$U-E1NN`;Z}I`i%R@m@uX6pU57i19e3gn5>y5OY%k`FuPa}?uF8#2dod+`d zuuG`h!RG%R7YXrBc|XImP`VLC4PY-7KiMDYewz;c)$yQH5L^^W{%#H##CE5htzW75 zG98?Cwc`9yHb{u#ay_7-Tf!<&xET0T@uAOOubWA(8}2_zc*FgN(X7j7|G~z)ocfC+ z8qm*lIC2Au^H)lLlkDrdgSH>}DmCzt^9HG37ll%Om${qmeuHQLoS!s53eL{H+_rcp z8}BLGPa5ClZr*Y!=%VH%`+dVPdTXG6D7UWLAojG#=dr2UOVvNW+e`BCG>fO~OKMrJ z?*)hN6b$qcX_RYih@3y>j5Dk+A&Y;#crE6BVAvcc=dViX_#x>pI9%kCgyaw9OW4CR z=rfA*yKBQeZh1eU&u9aA0^K~EF%+#-EA}(PF!l(XT;BzK#FMyfANX^klitbsI?+Y3 z9FNo=w|_<-Qr`(5ezHN1FLS6VOSymE?D+oQ`SVa7Li7tmqCwh|@%@;LF>kpW$j_3V#kcSy$-w2@w`-vR9EWXe6R!hC-bGk1rgqI$5+lZpkL81;$oMgtm|ehp&TGb zb@{W63cU3KJ}N}zZKWX6oa^_z&&r1C(gykl65k{Ivr7Q4zaWlvDYlJ@5k7Qg+XM4K zPF`!~rqx%O0Othx$Mh>V><7Hm&u8ghSS%fNs2%NvpKhJlHCsAYP;3nF%ayMsdoOa< zNR5@MOVfVt)%x-m-S@F&<|@kOHHz0tZSbDD!-{PR9ooF-Rl*DUdVj`0V~VoWcC4Je znt%2^knbIG*n6BJ4Ty`woJd7Jk z74at9Uw?tO4)r-b!1ufJWLrEYFDuFYwIQ!f9_hZ)-W2^N{sDaJz!`Cm$RD=f{eIUyk%k zpM+=#A7#Gu@o98`O_N#vg@0YKUEV$CeX(ZW*=;*}L4RTV&C6#Vuig%LO^B3yJj~ki0R)i+fv2+zb(!mx%>NV3~vA=(*>9yXetB0bY5wA#LkoOBLWdeXEwv>tDmtkWN-qlF!WxRnt^| L$WNxwIwCVswx}l+?rwur3ut7Ykuoy14F^dpSMlF5kJA z+p&Z`GSiu!*~k6e@BN+c`|e`_&dbZ$_U*hKIf)3NiHV7P8Sl&~q!^P$abC{jxfCam zFU4DPbDzj2$F=0^OhxF`dlCBiGK8*?@7z{4%0`H2m|oN%9Mk{*7RD$cm3}}!F*y=pse&eDa~6o%DGnAK=;I=R^E{bHu^qiN3;~nh3+P zy(Xy*^nKO&!YIGt@b4-Tz<$v{hwK|*{b_m>{s?eE$Sd_U*;xGZO;clSBxOLKZ^E|o zDqIkXIEI80M%TYXIAe|p;4d1e3DIM^Xza!Tq0pBiE&}|Y&Ii$7vbxef1^WAkWAxAf zc&!JAKRL04`D;Yh24jAM5$OM}KSq>)Os#KSOUyAP*!7^le;9``c2PK;kEZkkJ18ekq;to2b0?6eY{{s;GR?L6%Qhzf~?TnQm%{I>gZWO~79;h{w$okVX9^ z@htH*SN8y(Eg!|B5&KZPgYCCIhQscf5X+}_e@*`Wk(CF!xn=eUZ@|M=9Yv{nsNe{`C8VX_dSU}N!ca{nmt&8B~00SR8Pv;J+1;c+*f{POXKu^WrZ zJV`ESsqP^q1paF6>q!6Vg;ELVTo>;l#q9)a3f4+a?7hXXpY)@9d;?&vD{_SJe+_U| zD>+KoqvR);atliidFE5wx-N1({3r8mp_R9fkQN4gB>u1$#|(hA{%i3gjii5~a{0*p zwb?_0_e$sPByaIwc9|zzYJjfmdToh%e=VB%&G}<4F)+sRRpoc4`UU(FZW;eV)OGWfPZ_?Q{9sydI8JxK7U>VU=yt` z{*0`E`l|Cww+&|H{)b#2>Gd`d`1P@XOBCG{%J!ZdHB0AQ)ogxgO-qpViqNWe|a$@cq)qx8^Bf2eNb6|>aWeCK|e zt9>nh#+43|kG(AaMOUe17t8;$(;GxHJw+Ck-8@R>9T{POO$B80>g4v9=`!a3%IMY* zsrOQ)UzVNDb<0HZL-ob&;YIWu#Ti#>LVccpeSfJAxd`!my&_-E z@{`$5G?SJ9{q0@!NXb`wH^oXkGCw|dmY$@(5PkTWLrQ$fLya@$>sJr+tH26}BhZ~y$k7ujt_ZN0O)$N9Y6i&R$TZ#vlt{91jp;moj5 z^1x@VERf%IUBY>8Ra@6CT1|BT9o1$m%~s*vH}G%7i1L_}8E#7N_5Omj4V9$}ez$@XgxO zs>>8Q_2hwj<$`RO3 z%d#eQb__L0F5ZTA*hyB8biHDW3fCdsPzH>3f3jAwsSH83G z-DJkU<%VD%>UVj8{;g}|vUo-%Pd9}upmU=g4oN801KxGLN$RcnltOubbR8tQP0|~H z(j6~2KTiI^Vhp9%Xl~$Y z@Vfj;h+2F<`NiK}LMMzsU);OmSL>hN%lPm4H0$Wcd-juioOoJS#9sa4@(*lJ1NJ5! zKeC8>jR&0ak!{WD^S@6697PW{tkrF0V`7`g&$t>bkG^-ZXlEJoe|b!J`{BPRPZ!(7 zx*1oKyU< Date: Mon, 12 Jan 2015 10:08:24 +0100 Subject: [PATCH 02/15] fn_ to fnc_ --- .../{fn_canMoveRallypoint.sqf => fnc_canMoveRallypoint.sqf} | 0 .../respawn/functions/{fn_getAllGear.sqf => fnc_getAllGear.sqf} | 0 .../functions/{fn_handleKilled.sqf => fnc_handleKilled.sqf} | 0 .../functions/{fn_handleRespawn.sqf => fnc_handleRespawn.sqf} | 0 .../functions/{fn_initRallypoint.sqf => fnc_initRallypoint.sqf} | 0 addons/respawn/functions/{fn_module.sqf => fnc_module.sqf} | 0 .../{fn_moduleFriendlyFire.sqf => fnc_moduleFriendlyFire.sqf} | 0 .../{fn_moduleRallypoint.sqf => fnc_moduleRallypoint.sqf} | 0 .../functions/{fn_moveRallypoint.sqf => fnc_moveRallypoint.sqf} | 0 .../respawn/functions/{fn_removeBody.sqf => fnc_removeBody.sqf} | 0 ...oveDisconnectedPlayer.sqf => fnc_removeDisconnectedPlayer.sqf} | 0 .../respawn/functions/{fn_restoreGear.sqf => fnc_restoreGear.sqf} | 0 ...howFriendlyFireMessage.sqf => fnc_showFriendlyFireMessage.sqf} | 0 .../{fn_teleportToRallypoint.sqf => fnc_teleportToRallypoint.sqf} | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename addons/respawn/functions/{fn_canMoveRallypoint.sqf => fnc_canMoveRallypoint.sqf} (100%) rename addons/respawn/functions/{fn_getAllGear.sqf => fnc_getAllGear.sqf} (100%) rename addons/respawn/functions/{fn_handleKilled.sqf => fnc_handleKilled.sqf} (100%) rename addons/respawn/functions/{fn_handleRespawn.sqf => fnc_handleRespawn.sqf} (100%) rename addons/respawn/functions/{fn_initRallypoint.sqf => fnc_initRallypoint.sqf} (100%) rename addons/respawn/functions/{fn_module.sqf => fnc_module.sqf} (100%) rename addons/respawn/functions/{fn_moduleFriendlyFire.sqf => fnc_moduleFriendlyFire.sqf} (100%) rename addons/respawn/functions/{fn_moduleRallypoint.sqf => fnc_moduleRallypoint.sqf} (100%) rename addons/respawn/functions/{fn_moveRallypoint.sqf => fnc_moveRallypoint.sqf} (100%) rename addons/respawn/functions/{fn_removeBody.sqf => fnc_removeBody.sqf} (100%) rename addons/respawn/functions/{fn_removeDisconnectedPlayer.sqf => fnc_removeDisconnectedPlayer.sqf} (100%) rename addons/respawn/functions/{fn_restoreGear.sqf => fnc_restoreGear.sqf} (100%) rename addons/respawn/functions/{fn_showFriendlyFireMessage.sqf => fnc_showFriendlyFireMessage.sqf} (100%) rename addons/respawn/functions/{fn_teleportToRallypoint.sqf => fnc_teleportToRallypoint.sqf} (100%) diff --git a/addons/respawn/functions/fn_canMoveRallypoint.sqf b/addons/respawn/functions/fnc_canMoveRallypoint.sqf similarity index 100% rename from addons/respawn/functions/fn_canMoveRallypoint.sqf rename to addons/respawn/functions/fnc_canMoveRallypoint.sqf diff --git a/addons/respawn/functions/fn_getAllGear.sqf b/addons/respawn/functions/fnc_getAllGear.sqf similarity index 100% rename from addons/respawn/functions/fn_getAllGear.sqf rename to addons/respawn/functions/fnc_getAllGear.sqf diff --git a/addons/respawn/functions/fn_handleKilled.sqf b/addons/respawn/functions/fnc_handleKilled.sqf similarity index 100% rename from addons/respawn/functions/fn_handleKilled.sqf rename to addons/respawn/functions/fnc_handleKilled.sqf diff --git a/addons/respawn/functions/fn_handleRespawn.sqf b/addons/respawn/functions/fnc_handleRespawn.sqf similarity index 100% rename from addons/respawn/functions/fn_handleRespawn.sqf rename to addons/respawn/functions/fnc_handleRespawn.sqf diff --git a/addons/respawn/functions/fn_initRallypoint.sqf b/addons/respawn/functions/fnc_initRallypoint.sqf similarity index 100% rename from addons/respawn/functions/fn_initRallypoint.sqf rename to addons/respawn/functions/fnc_initRallypoint.sqf diff --git a/addons/respawn/functions/fn_module.sqf b/addons/respawn/functions/fnc_module.sqf similarity index 100% rename from addons/respawn/functions/fn_module.sqf rename to addons/respawn/functions/fnc_module.sqf diff --git a/addons/respawn/functions/fn_moduleFriendlyFire.sqf b/addons/respawn/functions/fnc_moduleFriendlyFire.sqf similarity index 100% rename from addons/respawn/functions/fn_moduleFriendlyFire.sqf rename to addons/respawn/functions/fnc_moduleFriendlyFire.sqf diff --git a/addons/respawn/functions/fn_moduleRallypoint.sqf b/addons/respawn/functions/fnc_moduleRallypoint.sqf similarity index 100% rename from addons/respawn/functions/fn_moduleRallypoint.sqf rename to addons/respawn/functions/fnc_moduleRallypoint.sqf diff --git a/addons/respawn/functions/fn_moveRallypoint.sqf b/addons/respawn/functions/fnc_moveRallypoint.sqf similarity index 100% rename from addons/respawn/functions/fn_moveRallypoint.sqf rename to addons/respawn/functions/fnc_moveRallypoint.sqf diff --git a/addons/respawn/functions/fn_removeBody.sqf b/addons/respawn/functions/fnc_removeBody.sqf similarity index 100% rename from addons/respawn/functions/fn_removeBody.sqf rename to addons/respawn/functions/fnc_removeBody.sqf diff --git a/addons/respawn/functions/fn_removeDisconnectedPlayer.sqf b/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf similarity index 100% rename from addons/respawn/functions/fn_removeDisconnectedPlayer.sqf rename to addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf diff --git a/addons/respawn/functions/fn_restoreGear.sqf b/addons/respawn/functions/fnc_restoreGear.sqf similarity index 100% rename from addons/respawn/functions/fn_restoreGear.sqf rename to addons/respawn/functions/fnc_restoreGear.sqf diff --git a/addons/respawn/functions/fn_showFriendlyFireMessage.sqf b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf similarity index 100% rename from addons/respawn/functions/fn_showFriendlyFireMessage.sqf rename to addons/respawn/functions/fnc_showFriendlyFireMessage.sqf diff --git a/addons/respawn/functions/fn_teleportToRallypoint.sqf b/addons/respawn/functions/fnc_teleportToRallypoint.sqf similarity index 100% rename from addons/respawn/functions/fn_teleportToRallypoint.sqf rename to addons/respawn/functions/fnc_teleportToRallypoint.sqf From 8bc6aceecaf1416f39460d61dd29f84c9d9cd27a Mon Sep 17 00:00:00 2001 From: jodav Date: Mon, 12 Jan 2015 10:20:50 +0100 Subject: [PATCH 03/15] postCBA --- addons/respawn/CfgAddons.hpp | 5 + addons/respawn/CfgEventHandlers.hpp | 20 ++ addons/respawn/CfgVehicleClasses.hpp | 5 + addons/respawn/CfgVehicles.hpp | 206 ++++++++++++++++++++ addons/respawn/XEH_preInit.sqf | 16 ++ addons/respawn/config.cpp | 279 +-------------------------- addons/respawn/script_component.hpp | 12 ++ 7 files changed, 273 insertions(+), 270 deletions(-) create mode 100644 addons/respawn/CfgAddons.hpp create mode 100644 addons/respawn/CfgEventHandlers.hpp create mode 100644 addons/respawn/CfgVehicleClasses.hpp create mode 100644 addons/respawn/CfgVehicles.hpp create mode 100644 addons/respawn/XEH_preInit.sqf create mode 100644 addons/respawn/script_component.hpp diff --git a/addons/respawn/CfgAddons.hpp b/addons/respawn/CfgAddons.hpp new file mode 100644 index 00000000000..910dc2ac4f5 --- /dev/null +++ b/addons/respawn/CfgAddons.hpp @@ -0,0 +1,5 @@ +class CfgAddons { + class GVAR(Rallypoints) { + list[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent"}; + }; +}; diff --git a/addons/respawn/CfgEventHandlers.hpp b/addons/respawn/CfgEventHandlers.hpp new file mode 100644 index 00000000000..687de2a825d --- /dev/null +++ b/addons/respawn/CfgEventHandlers.hpp @@ -0,0 +1,20 @@ +class Extended_PreInit_EventHandlers { + class ADDON { + init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); + }; +}; + +class Extended_Killed_EventHandlers { + class CAManBase { + class GVAR(HandleGear) { + killed = QUOTE( _this call FUNC(handleKilled) ); + }; + }; +}; +class Extended_Respawn_EventHandlers { + class CAManBase { + class GVAR(HandleGear) { + respawn = QUOTE( _this call FUNC(handleRespawn) ); + }; + }; +}; diff --git a/addons/respawn/CfgVehicleClasses.hpp b/addons/respawn/CfgVehicleClasses.hpp new file mode 100644 index 00000000000..2907b719e97 --- /dev/null +++ b/addons/respawn/CfgVehicleClasses.hpp @@ -0,0 +1,5 @@ +class CfgVehicleClasses { + class GVAR(Rallypoints) { + displayName = "ACE Respawn"; + }; +}; diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp new file mode 100644 index 00000000000..51ef4f030c6 --- /dev/null +++ b/addons/respawn/CfgVehicles.hpp @@ -0,0 +1,206 @@ +class CfgVehicles { + class Module_F; + class ACE_ModuleRespawn: Module_F { + author = "$STR_ACE_Core_ACETeam"; + category = "ACE"; + displayName = "Respawn System"; + function = FUNC(module); + scope = 2; + isGlobal = 1; + icon = PATHTOF(UI\Icon_Module_Respawn_ca.paa); + class Arguments { + class SavePreDeathGear { + displayName = "Save Gear?"; + description = "Respawn with the gear a soldier had just before his death?"; + typeName = "BOOL"; + class values { + class Yes { name = "Yes"; value = 1;}; + class No { default = 1; name = "No"; value = 0; }; + }; + }; + class RemoveDeadBodiesDisonncected { + displayName = "Remove bodies?"; + description = "Remove player bodies after disconnect?"; + typeName = "BOOL"; + class values { + class Yes { default = 1; name = "Yes"; value = 1;}; + class No { name = "No"; value = 0; }; + }; + }; + }; + }; + + class ACE_ModuleFriendlyFire: Module_F { + author = "$STR_ACE_Core_ACETeam"; + category = "ACE"; + displayName = "Friendly Fire Messages"; + function = FUNC(moduleFriendlyFire); + scope = 2; + isGlobal = 1; + icon = PATHTOF(UI\Icon_Module_FriendlyFire_ca.paa); + class Arguments { + }; + }; + + class ACE_ModuleRallypoint: Module_F { + author = "$STR_ACE_Core_ACETeam"; + category = "ACE"; + displayName = "Rallypoint System"; + function = FUNC(moduleRallypoint); + scope = 2; + isGlobal = 1; + icon = PATHTOF(UI\Icon_Module_Rallypoint_ca.paa); + class Arguments { + }; + }; + + // rallypoints + class FlagCarrier; + class Flag_NATO_F: FlagCarrier { + class ACE_Actions; + }; + + class Flag_CSAT_F: FlagCarrier { + class ACE_Actions; + }; + + class Flag_AAF_F: FlagCarrier { + class ACE_Actions; + }; + + // static + class ACE_Rallypoint_West: Flag_NATO_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint West Base"; + vehicleClass = QGVAR(Rallypoints); + + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint); + }; + class ACE_Actions: ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Rallypoint"; + distance = 4; + condition = QUOTE( side group _player == west ); + statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); ); + showDisabled = 1; + priority = 1; + }; + }; + }; + + class ACE_Rallypoint_East: Flag_CSAT_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint East Base"; + vehicleClass = QGVAR(Rallypoints); + + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint); + }; + class ACE_Actions: ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Rallypoint"; + distance = 4; + condition = QUOTE( side group _player == east ); + statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); )"; + showDisabled = 1; + priority = 1; + }; + }; + }; + + class ACE_Rallypoint_Independent: Flag_AAF_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint Independent Base"; + vehicleClass = QGVAR(Rallypoints); + + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint); + }; + class ACE_Actions: ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Rallypoint"; + distance = 4; + condition = QUOTE( side group _player == independent ); + statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); )"; + showDisabled = 1; + priority = 1; + }; + }; + }; + + // moveable + class ACE_RallypointExit_West: Flag_NATO_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint West"; + vehicleClass = QGVAR(Rallypoints); + + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint); + }; + class ACE_Actions: ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Base"; + distance = 4; + condition = QUOTE( side group _player == west ); + statement = QUOTE( [_player, side group _player, true] call FUNC(teleportToRallypoint); ); + showDisabled = 1; + priority = 1; + }; + }; + }; + + class ACE_RallypointExit_East: Flag_CSAT_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint East"; + vehicleClass = QGVAR(Rallypoints); + + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint); + }; + class ACE_Actions: ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Base"; + distance = 4; + condition = QUOTE( side group _player == east ); + statement = QUOTE( [_player, side group _player, true] call FUNC(teleportToRallypoint); ); + showDisabled = 1; + priority = 1; + }; + }; + }; + + class ACE_RallypointExit_Independent: Flag_AAF_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint Independent"; + vehicleClass = QGVAR(Rallypoints); + + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint); + }; + class ACE_Actions: ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Base"; + distance = 4; + condition = QUOTE( side group _player == independent ); + statement = QUOTE( [_player, side group _player, true] call FUNC(teleportToRallypoint); ); + showDisabled = 1; + priority = 1; + }; + }; + }; + + // team leader + class Man; + class CAManBase: Man { + class ACE_SelfActions { + class ACE_MoveRallypoint { + displayName = "Move Rallypoint"; + condition = QUOTE( [_player, side group _player] call FUNC(canMoveRallypoint) ); + statement = QUOTE( [_player, side group _player] call FUNC(moveRallypoint) ); + showDisabled = 0; + priority = -0.5; + }; + }; + }; +}; \ No newline at end of file diff --git a/addons/respawn/XEH_preInit.sqf b/addons/respawn/XEH_preInit.sqf new file mode 100644 index 00000000000..9ce46777dde --- /dev/null +++ b/addons/respawn/XEH_preInit.sqf @@ -0,0 +1,16 @@ +#include "script_component.hpp" + +PREP(canMoveRallypoint); +PREP(getAllGear); +PREP(handleKilled); +PREP(handleRespawn); +PREP(initRallypoint); +PREP(module); +PREP(moduleFriendlyFire); +PREP(moduleRallypoint); +PREP(moveRallypoint); +PREP(removeBody); +PREP(removeDisconnectedPlayer); +PREP(restoreGear); +PREP(showFriendlyFireMessage); +PREP(teleportToRallypoint); diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp index a959cc34f7f..f193410a4a1 100644 --- a/addons/respawn/config.cpp +++ b/addons/respawn/config.cpp @@ -1,9 +1,11 @@ +#include "script_component.hpp" + class CfgPatches { - class AGM_Respawn { + class ADDON { units[] = {}; - weapons[] = {"AGM_Rallypoint_West", "AGM_Rallypoint_East", "AGM_Rallypoint_Independent", "AGM_RallypointExit_West", "AGM_RallypointExit_East", "AGM_RallypointExit_Independent"}; + weapons[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent"}; requiredVersion = 0.60; - requiredAddons[] = {AGM_Core}; + requiredAddons[] = {"ace_core"}; version = "0.95"; versionStr = "0.95"; versionAr[] = {0,95,0}; @@ -12,270 +14,7 @@ class CfgPatches { }; }; -class CfgFunctions { - class AGM_Respawn { - class AGM_Respawn { - file = "AGM_Respawn\functions"; - class canMoveRallypoint; - class getAllGear; - class handleKilled; - class handleRespawn; - class initRallypoint; - class module; - class moduleFriendlyFire; - class moduleRallypoint; - class moveRallypoint; - class removeBody; - class removeDisconnectedPlayer; - class restoreGear; - class showFriendlyFireMessage; - class teleportToRallypoint; - }; - }; -}; - -class Extended_Killed_EventHandlers { - class CAManBase { - class AGM_Respawn_HandleGear { - killed = "_this call AGM_Respawn_fnc_handleKilled"; - }; - }; -}; -class Extended_Respawn_EventHandlers { - class CAManBase { - class AGM_Respawn_HandleGear { - respawn = "_this call AGM_Respawn_fnc_handleRespawn"; - }; - }; -}; - -class CfgAddons { - class AGM_Respawn_Rallypoints { - list[] = {"AGM_Rallypoint_West", "AGM_Rallypoint_East", "AGM_Rallypoint_Independent", "AGM_RallypointExit_West", "AGM_RallypointExit_East", "AGM_RallypointExit_Independent"}; - }; -}; - -class CfgVehicleClasses { - class AGM_Respawn_Rallypoints { - displayName = "AGM Respawn"; - }; -}; - -class CfgVehicles { - class Module_F; - class AGM_ModuleRespawn: Module_F { - author = "$STR_AGM_Core_AGMTeam"; - category = "AGM"; - displayName = "Respawn System"; - function = "AGM_Respawn_fnc_module"; - scope = 2; - isGlobal = 1; - icon = "\AGM_Respawn\UI\Icon_Module_Respawn_ca.paa"; - class Arguments { - class SavePreDeathGear { - displayName = "Save Gear?"; - description = "Respawn with the gear a soldier had just before his death?"; - typeName = "BOOL"; - class values { - class Yes { name = "Yes"; value = 1;}; - class No { default = 1; name = "No"; value = 0; }; - }; - }; - class RemoveDeadBodiesDisonncected { - displayName = "Remove bodies?"; - description = "Remove player bodies after disconnect?"; - typeName = "BOOL"; - class values { - class Yes { default = 1; name = "Yes"; value = 1;}; - class No { name = "No"; value = 0; }; - }; - }; - /*class BodyRemoveTimer { - displayName = "Time to remove bodies."; - description = "The amount of time (in seconds) after that a unit's body gets removed. Default: 90"; - typeName = "NUMBER"; - defaultValue = 90; - };*/ - }; - }; - - class AGM_ModuleFriendlyFire: Module_F { - author = "$STR_AGM_Core_AGMTeam"; - category = "AGM"; - displayName = "Friendly Fire Messages"; - function = "AGM_Respawn_fnc_moduleFriendlyFire"; - scope = 2; - isGlobal = 1; - icon = "\AGM_Respawn\UI\Icon_Module_FriendlyFire_ca.paa"; - class Arguments { - }; - }; - - class AGM_ModuleRallypoint: Module_F { - author = "$STR_AGM_Core_AGMTeam"; - category = "AGM"; - displayName = "Rallypoint System"; - function = "AGM_Respawn_fnc_moduleRallypoint"; - scope = 2; - isGlobal = 1; - icon = "\AGM_Respawn\UI\Icon_Module_Rallypoint_ca.paa"; - class Arguments { - }; - }; - - // rallypoints - class FlagCarrier; - class Flag_NATO_F: FlagCarrier { - class AGM_Actions; - }; - - class Flag_CSAT_F: FlagCarrier { - class AGM_Actions; - }; - - class Flag_AAF_F: FlagCarrier { - class AGM_Actions; - }; - - // static - class AGM_Rallypoint_West: Flag_NATO_F { - author = "$STR_AGM_Core_AGMTeam"; - displayName = "Rallypoint West Base"; - vehicleClass = "AGM_Respawn_Rallypoints"; - - class EventHandlers { - init = "(_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call AGM_Respawn_fnc_initRallypoint"; - }; - class AGM_Actions: AGM_Actions { - class AGM_Teleport { - displayName = "Teleport to Rallypoint"; - distance = 4; - condition = "side group _player == west"; - statement = "[_player, side group _player, false] call AGM_Respawn_fnc_teleportToRallypoint;"; - showDisabled = 1; - priority = 1; - }; - }; - }; - - class AGM_Rallypoint_East: Flag_CSAT_F { - author = "$STR_AGM_Core_AGMTeam"; - displayName = "Rallypoint East Base"; - vehicleClass = "AGM_Respawn_Rallypoints"; - - class EventHandlers { - init = "(_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call AGM_Respawn_fnc_initRallypoint"; - }; - class AGM_Actions: AGM_Actions { - class AGM_Teleport { - displayName = "Teleport to Rallypoint"; - distance = 4; - condition = "side group _player == east"; - statement = "[_player, side group _player, false] call AGM_Respawn_fnc_teleportToRallypoint;"; - showDisabled = 1; - priority = 1; - }; - }; - }; - - class AGM_Rallypoint_Independent: Flag_AAF_F { - author = "$STR_AGM_Core_AGMTeam"; - displayName = "Rallypoint Independent Base"; - vehicleClass = "AGM_Respawn_Rallypoints"; - - class EventHandlers { - init = "(_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call AGM_Respawn_fnc_initRallypoint"; - }; - class AGM_Actions: AGM_Actions { - class AGM_Teleport { - displayName = "Teleport to Rallypoint"; - distance = 4; - condition = "side group _player == independent"; - statement = "[_player, side group _player, false] call AGM_Respawn_fnc_teleportToRallypoint;"; - showDisabled = 1; - priority = 1; - }; - }; - }; - - // moveable - class AGM_RallypointExit_West: Flag_NATO_F { - author = "$STR_AGM_Core_AGMTeam"; - displayName = "Rallypoint West"; - vehicleClass = "AGM_Respawn_Rallypoints"; - - class EventHandlers { - init = "(_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call AGM_Respawn_fnc_initRallypoint"; - }; - class AGM_Actions: AGM_Actions { - class AGM_Teleport { - displayName = "Teleport to Base"; - distance = 4; - condition = "side group _player == west"; - statement = "[_player, side group _player, true] call AGM_Respawn_fnc_teleportToRallypoint;"; - showDisabled = 1; - priority = 1; - }; - }; - }; - - class AGM_RallypointExit_East: Flag_CSAT_F { - author = "$STR_AGM_Core_AGMTeam"; - displayName = "Rallypoint East"; - vehicleClass = "AGM_Respawn_Rallypoints"; - - class EventHandlers { - init = "(_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call AGM_Respawn_fnc_initRallypoint"; - }; - class AGM_Actions: AGM_Actions { - class AGM_Teleport { - displayName = "Teleport to Base"; - distance = 4; - condition = "side group _player == east"; - statement = "[_player, side group _player, true] call AGM_Respawn_fnc_teleportToRallypoint;"; - showDisabled = 1; - priority = 1; - }; - }; - }; - - class AGM_RallypointExit_Independent: Flag_AAF_F { - author = "$STR_AGM_Core_AGMTeam"; - displayName = "Rallypoint Independent"; - vehicleClass = "AGM_Respawn_Rallypoints"; - - class EventHandlers { - init = "(_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call AGM_Respawn_fnc_initRallypoint"; - }; - class AGM_Actions: AGM_Actions { - class AGM_Teleport { - displayName = "Teleport to Base"; - distance = 4; - condition = "side group _player == independent"; - statement = "[_player, side group _player, true] call AGM_Respawn_fnc_teleportToRallypoint;"; - showDisabled = 1; - priority = 1; - }; - }; - }; - - // team leader - class Man; - class CAManBase: Man { - class AGM_SelfActions { - class AGM_MoveRallypoint { - displayName = "Move Rallypoint"; - condition = "[_player, side group _player] call AGM_Respawn_fnc_canMoveRallypoint"; - statement = "[_player, side group _player] call AGM_Respawn_fnc_moveRallypoint"; - showDisabled = 0; - priority = -0.5; - }; - }; - }; -}; - -class AGM_Parameters_Boolean { - // Boolean Parameters (0/1) - AGM_Respawn_SavePreDeathGear = 0; - AGM_Respawn_RemoveDeadBodiesDisonncected = 1; -}; +#include "CfgEventHandlers.hpp" +#include "CfgAddons.hpp" +#include "CfgVehicleClasses.hpp" +#include "CfgVehicles.hpp" diff --git a/addons/respawn/script_component.hpp b/addons/respawn/script_component.hpp new file mode 100644 index 00000000000..0ecb27b1d4f --- /dev/null +++ b/addons/respawn/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT respawn +#include "\z\ace\addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_RESPAWN + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_RESPAWN + #define DEBUG_SETTINGS DEBUG_SETTINGS_RESPAWN +#endif + +#include "\z\ace\addons\main\script_macros.hpp" From 074acf631b5350d9b6b2a351c12a9069f89ec066 Mon Sep 17 00:00:00 2001 From: jodav Date: Mon, 12 Jan 2015 10:25:41 +0100 Subject: [PATCH 04/15] remove " --- addons/respawn/CfgVehicles.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index 51ef4f030c6..8d8eddb8839 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -102,7 +102,7 @@ class CfgVehicles { displayName = "Teleport to Rallypoint"; distance = 4; condition = QUOTE( side group _player == east ); - statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); )"; + statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); ); showDisabled = 1; priority = 1; }; @@ -122,7 +122,7 @@ class CfgVehicles { displayName = "Teleport to Rallypoint"; distance = 4; condition = QUOTE( side group _player == independent ); - statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); )"; + statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); ); showDisabled = 1; priority = 1; }; From d85c05ffe3d5db6f50d3a113edc9b96a7d548b09 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 12 Jan 2015 03:31:24 -0600 Subject: [PATCH 05/15] syntax fixes --- addons/respawn/CfgVehicles.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index 8d8eddb8839..51f4e919ecd 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -75,7 +75,7 @@ class CfgVehicles { vehicleClass = QGVAR(Rallypoints); class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint); + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint)); }; class ACE_Actions: ACE_Actions { class ACE_Teleport { @@ -95,7 +95,7 @@ class CfgVehicles { vehicleClass = QGVAR(Rallypoints); class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint); + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint)); }; class ACE_Actions: ACE_Actions { class ACE_Teleport { @@ -115,7 +115,7 @@ class CfgVehicles { vehicleClass = QGVAR(Rallypoints); class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint); + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint)); }; class ACE_Actions: ACE_Actions { class ACE_Teleport { @@ -136,7 +136,7 @@ class CfgVehicles { vehicleClass = QGVAR(Rallypoints); class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint); + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint)); }; class ACE_Actions: ACE_Actions { class ACE_Teleport { @@ -156,7 +156,7 @@ class CfgVehicles { vehicleClass = QGVAR(Rallypoints); class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint); + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint)); }; class ACE_Actions: ACE_Actions { class ACE_Teleport { @@ -176,7 +176,7 @@ class CfgVehicles { vehicleClass = QGVAR(Rallypoints); class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint); + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint)); }; class ACE_Actions: ACE_Actions { class ACE_Teleport { @@ -203,4 +203,4 @@ class CfgVehicles { }; }; }; -}; \ No newline at end of file +}; From 587105356407d420f960ff02dfdbfc74d6c160f1 Mon Sep 17 00:00:00 2001 From: jodav Date: Mon, 12 Jan 2015 10:49:21 +0100 Subject: [PATCH 06/15] cba'd functions --- .../functions/fnc_canMoveRallypoint.sqf | 10 +++-- addons/respawn/functions/fnc_handleKilled.sqf | 12 +++--- .../respawn/functions/fnc_handleRespawn.sqf | 4 +- .../respawn/functions/fnc_initRallypoint.sqf | 2 +- addons/respawn/functions/fnc_module.sqf | 40 +++++++++---------- .../functions/fnc_moduleFriendlyFire.sqf | 4 +- .../functions/fnc_moduleRallypoint.sqf | 6 +-- .../respawn/functions/fnc_moveRallypoint.sqf | 12 +++--- addons/respawn/functions/fnc_removeBody.sqf | 2 +- .../fnc_removeDisconnectedPlayer.sqf | 2 +- .../functions/fnc_showFriendlyFireMessage.sqf | 6 +-- .../functions/fnc_teleportToRallypoint.sqf | 16 ++++---- addons/respawn/stringtable.xml | 21 ++++++++++ 13 files changed, 81 insertions(+), 56 deletions(-) create mode 100644 addons/respawn/stringtable.xml diff --git a/addons/respawn/functions/fnc_canMoveRallypoint.sqf b/addons/respawn/functions/fnc_canMoveRallypoint.sqf index a0e0e2ab4bf..d4607e99127 100644 --- a/addons/respawn/functions/fnc_canMoveRallypoint.sqf +++ b/addons/respawn/functions/fnc_canMoveRallypoint.sqf @@ -5,10 +5,12 @@ private ["_unit", "_side"]; _unit = _this select 0; _side = _this select 1; -_unit getVariable ["AGM_canMoveRallypoint", false] +// rallypoint names are defined in CfgVehicles.hpp + +_unit getVariable ["ACE_canMoveRallypoint"), false] && {!isNull ([ objNull, - missionNamespace getVariable ["AGM_Rallypoint_West", objNull], - missionNamespace getVariable ["AGM_Rallypoint_East", objNull], - missionNamespace getVariable ["AGM_Rallypoint_Independent", objNull] + missionNamespace getVariable ["ACE_Rallypoint_West", objNull], + missionNamespace getVariable ["ACE_Rallypoint_East", objNull], + missionNamespace getVariable ["ACE_Rallypoint_Independent", objNull] ] select ([west, east, independent] find _side) + 1)} diff --git a/addons/respawn/functions/fnc_handleKilled.sqf b/addons/respawn/functions/fnc_handleKilled.sqf index 48fb056ebe0..d37dccf6918 100644 --- a/addons/respawn/functions/fnc_handleKilled.sqf +++ b/addons/respawn/functions/fnc_handleKilled.sqf @@ -1,5 +1,5 @@ /* - Name: AGM_Respawn_fnc_handleKilled + Name: ACE_Respawn_fnc_handleKilled Author(s): bux578 @@ -20,12 +20,12 @@ private ["_killedUnit"]; _killedUnit = _this select 0; // Saves the gear when the player is killed -AGM_Respawn_unitGear = []; +GVAR(unitGear) = []; -if (AGM_Respawn_SavePreDeathGear) then { - AGM_Respawn_unitGear = [_killedUnit] call AGM_Respawn_fnc_getAllGear; +if (GVAR(SavePreDeathGear)) then { + GVAR(unitGear) = [_killedUnit] call FUNC(getAllGear); }; -if (missionNamespace getVariable ["AGM_showFriendlyFireMessage", false]) then { - [_this, "AGM_Respawn_fnc_showFriendlyFireMessage", 2] call AGM_Core_fnc_execRemoteFnc; +if (missionNamespace getVariable [QGVAR(showFriendlyFireMessage), false]) then { + [_this, FUNC(showFriendlyFireMessage), 2] call EFUNC(Core, execRemoteFnc); }; diff --git a/addons/respawn/functions/fnc_handleRespawn.sqf b/addons/respawn/functions/fnc_handleRespawn.sqf index 499bd33e8a9..83490eb7f33 100644 --- a/addons/respawn/functions/fnc_handleRespawn.sqf +++ b/addons/respawn/functions/fnc_handleRespawn.sqf @@ -20,6 +20,6 @@ private ["_respawnedUnit"]; _respawnedUnit = _this select 0; // Restores the gear when the player respawns -if (AGM_Respawn_SavePreDeathGear) then { - [_respawnedUnit, AGM_Respawn_unitGear] call AGM_Respawn_fnc_restoreGear; +if (GVAR(SavePreDeathGear)) then { + [_respawnedUnit, GVAR(unitGear)] call FUNC(restoreGear); }; diff --git a/addons/respawn/functions/fnc_initRallypoint.sqf b/addons/respawn/functions/fnc_initRallypoint.sqf index ae84a026051..492e4261137 100644 --- a/addons/respawn/functions/fnc_initRallypoint.sqf +++ b/addons/respawn/functions/fnc_initRallypoint.sqf @@ -13,5 +13,5 @@ if (isNil _name) then { publicVariable _name; } else { deleteVehicle _rallypoint; - diag_log text "[AGM] Respawn: ERROR Multiple Rallypoints of same type."; + diag_log text "[ACE] Respawn: ERROR Multiple Rallypoints of same type."; }; diff --git a/addons/respawn/functions/fnc_module.sqf b/addons/respawn/functions/fnc_module.sqf index c407da505b3..bc957c06092 100644 --- a/addons/respawn/functions/fnc_module.sqf +++ b/addons/respawn/functions/fnc_module.sqf @@ -16,28 +16,28 @@ _activated = _this select 2; if !(_activated) exitWith {}; -AGM_Respawn_Module = true; +GVAR(Module) = true; -[_logic, "AGM_Respawn_SavePreDeathGear", "SavePreDeathGear"] call AGM_Core_fnc_readBooleanParameterFromModule; -[_logic, "AGM_Respawn_RemoveDeadBodiesDisonncected", "RemoveDeadBodiesDisonncected"] call AGM_Core_fnc_readBooleanParameterFromModule; +[_logic, QGVAR(SavePreDeathGear), "SavePreDeathGear"] call EFUNC(Core, readBooleanParameterFromModule); +[_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(Core, readBooleanParameterFromModule); if (isServer) then { - if (AGM_Respawn_RemoveDeadBodiesDisonncected) then { - _fnc_deleteDisconnected = { - _this spawn { - _unit = _this select 0; - - sleep 4; - - if (!alive _unit) then { - deleteVehicle _unit; - }; - }; - false - }; - - addMissionEventHandler ["HandleDisconnect", _fnc_deleteDisconnected]; - }; + if (GVAR(RemoveDeadBodiesDisonncected)) then { + _fnc_deleteDisconnected = { + _this spawn { + _unit = _this select 0; + + sleep 4; + + if (!alive _unit) then { + deleteVehicle _unit; + }; + }; + false + }; + + addMissionEventHandler ["HandleDisconnect", _fnc_deleteDisconnected]; + }; }; -diag_log text "[AGM]: Respawn Module Initialized."; +diag_log text "[ACE]: Respawn Module Initialized."; diff --git a/addons/respawn/functions/fnc_moduleFriendlyFire.sqf b/addons/respawn/functions/fnc_moduleFriendlyFire.sqf index 3dc6fb302fb..b274ed2706a 100644 --- a/addons/respawn/functions/fnc_moduleFriendlyFire.sqf +++ b/addons/respawn/functions/fnc_moduleFriendlyFire.sqf @@ -18,11 +18,11 @@ _this spawn { if !(_activated) exitWith {}; if (isServer) then { - _varName = "AGM_showFriendlyFireMessage"; + _varName = QGVAR(showFriendlyFireMessage); missionNamespace setVariable [_varName, true]; publicVariable _varName; }; - diag_log text "[AGM]: Friendly Fire Messages Module Initialized."; + diag_log text "[ACE]: Friendly Fire Messages Module Initialized."; }; diff --git a/addons/respawn/functions/fnc_moduleRallypoint.sqf b/addons/respawn/functions/fnc_moduleRallypoint.sqf index 33efac1953d..62f36fc7546 100644 --- a/addons/respawn/functions/fnc_moduleRallypoint.sqf +++ b/addons/respawn/functions/fnc_moduleRallypoint.sqf @@ -16,10 +16,8 @@ _activated = _this select 2; if !(_activated) exitWith {}; -//_mode = parseNumber (_logic getVariable "Action"); - { - _x setVariable ["AGM_canMoveRallypoint", true]; + _x setVariable ["ACE_canMoveRallypoint", true]; } forEach _units; -diag_log text "[AGM]: Rallypoint Module Initialized."; +diag_log text "[ACE]: Rallypoint Module Initialized."; diff --git a/addons/respawn/functions/fnc_moveRallypoint.sqf b/addons/respawn/functions/fnc_moveRallypoint.sqf index 68d197844c4..54665282820 100644 --- a/addons/respawn/functions/fnc_moveRallypoint.sqf +++ b/addons/respawn/functions/fnc_moveRallypoint.sqf @@ -4,11 +4,13 @@ _this spawn { _unit = _this select 0; _side = _this select 1; + // rallypoint names are defined in CfgVehicles.hpp + _rallypoint = [ objNull, - missionNamespace getVariable ["AGM_RallypointExit_West", objNull], - missionNamespace getVariable ["AGM_RallypointExit_East", objNull], - missionNamespace getVariable ["AGM_RallypointExit_Independent", objNull] + missionNamespace getVariable ["ACE_Rallypoint_West", objNull], + missionNamespace getVariable ["ACE_RallypointExit_East", objNull], + missionNamespace getVariable ["ACE_RallypointExit_Independent", objNull] ] select ([west, east, independent] find _side) + 1; if (isNull _rallypoint) exitWith {}; @@ -19,7 +21,7 @@ _this spawn { _position set [2, 0]; - ["Deploy in 5 seconds ..."] call AGM_Core_fnc_displayTextStructured; + [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core, displayTextStructured); sleep 5; _rallypoint setPosATL _position; @@ -31,5 +33,5 @@ _this spawn { _marker setMarkerTextLocal format ["%1:%2", [date select 3, 2, 0] call CBA_fnc_FORMATNumber, [date select 4, 2, 0] call CBA_fnc_FORMATNumber]; */ - ["Rallypoint deployed"] call AGM_Core_fnc_displayTextStructured; + [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core, displayTextStructured); }; diff --git a/addons/respawn/functions/fnc_removeBody.sqf b/addons/respawn/functions/fnc_removeBody.sqf index 063b39abec9..c8aaacd4442 100644 --- a/addons/respawn/functions/fnc_removeBody.sqf +++ b/addons/respawn/functions/fnc_removeBody.sqf @@ -15,7 +15,7 @@ private ["_body", "_forceRemove", "_bodyRemoveTimer"]; _body = _this select 0; _forceRemove = _this select 1; -_bodyRemoveTimer = AGM_Respawn_BodyRemoveTimer max 0; +_bodyRemoveTimer = GVAR(BodyRemoveTimer) max 0; // could be used for SpecOps missions. if (_forceRemove) then { diff --git a/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf b/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf index a3fbbc737e8..2ba44ef92ce 100644 --- a/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf +++ b/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf @@ -11,5 +11,5 @@ _forceRemove = _this select 0; } forEach playableUnits; if (!isNil "_body" && {!alive _body}) then { - [_body, _forceRemove] call AGM_Respawn_fnc_removeBody; + [_body, _forceRemove] call FUNC(removeBody); }; diff --git a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf index e505d2cfffa..e5b8a19217c 100644 --- a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf +++ b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf @@ -5,8 +5,8 @@ private ["_unit", "_killer"]; _unit = _this select 0; _killer = _this select 1; -if (_unit != _killer && side group _unit in [side group AGM_player, civilian] && {side group _killer == side group AGM_player}) then { - systemChat format ["%1 was killed by %2", [_unit] call AGM_Core_fnc_getName, [_killer] call AGM_Core_fnc_getName]; +if (_unit != _killer && side group _unit in [side group ACE_player, civilian] && {side group _killer == side group ACE_player}) then { + systemChat format ["%1 was killed by %2", [_unit] call EFUNC(Core, getName), [_killer] call EFUNC(Core, getName)]; - [_unit, "killedByFriendly", [_unit, _killer]] call AGM_Core_fnc_callCustomEventHandlers; + [_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(Core, callCustomEventHandlers); }; diff --git a/addons/respawn/functions/fnc_teleportToRallypoint.sqf b/addons/respawn/functions/fnc_teleportToRallypoint.sqf index 387039479e2..420865949be 100644 --- a/addons/respawn/functions/fnc_teleportToRallypoint.sqf +++ b/addons/respawn/functions/fnc_teleportToRallypoint.sqf @@ -6,22 +6,24 @@ _unit = _this select 0; _side = _this select 1; _toBase = _this select 2; +// rallypoint names are defined in CfgVehicles.hpp + _rallypoint = ([ [ objNull, - missionNamespace getVariable ["AGM_RallypointExit_West", objNull], - missionNamespace getVariable ["AGM_RallypointExit_East", objNull], - missionNamespace getVariable ["AGM_RallypointExit_Independent", objNull] + missionNamespace getVariable ["ACE_RallypointExit_West", objNull], + missionNamespace getVariable ["ACE_RallypointExit_East", objNull], + missionNamespace getVariable ["ACE_RallypointExit_Independent", objNull] ], [ objNull, - missionNamespace getVariable ["AGM_Rallypoint_West", objNull], - missionNamespace getVariable ["AGM_Rallypoint_East", objNull], - missionNamespace getVariable ["AGM_Rallypoint_Independent", objNull] + missionNamespace getVariable ["ACE_Rallypoint_West", objNull], + missionNamespace getVariable ["ACE_Rallypoint_East", objNull], + missionNamespace getVariable ["ACE_Rallypoint_Independent", objNull] ] ] select _toBase) select ([west, east, independent] find _side) + 1; if (isNull _rallypoint) exitWith {}; _unit setPosASL (getPosASL _rallypoint); -[["Teleported to Rallypoint", "Teleported to Base"] select _toBase] call AGM_Core_fnc_displayTextStructured; +[[localize "STR_ACE_Respawn_TeleportedToRallypoint", localize "STR_ACE_Respawn_TeleportedToBase"] select _toBase] call EFUNC(Core, displayTextStructured); diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml new file mode 100644 index 00000000000..59a9b2b31ce --- /dev/null +++ b/addons/respawn/stringtable.xml @@ -0,0 +1,21 @@ + + + + + Deploy in 5 seconds ... + Wird in 5 Sekunden errichtet ... + + + Rallypoint deployed + Rallypoint errichtet + + + Teleported to Base + Zur Basis teleportiert + + + Teleported to Rallypoint + Zum Rallypoint teleportiert + + + From 9ae51df453061ed2554250f2b6f907995e69e010 Mon Sep 17 00:00:00 2001 From: jodav Date: Mon, 12 Jan 2015 10:54:32 +0100 Subject: [PATCH 07/15] removed respawn from "TO_MERGE" --- .../UI/Icon_Module_FriendlyFire_ca.paa | Bin 5625 -> 0 bytes .../Respawn/UI/Icon_Module_Rallypoint_ca.paa | Bin 5625 -> 0 bytes .../agm/Respawn/UI/Icon_Module_Respawn_ca.paa | Bin 5625 -> 0 bytes TO_MERGE/agm/Respawn/config.cpp | 281 ------------------ .../functions/fn_canMoveRallypoint.sqf | 14 - .../agm/Respawn/functions/fn_getAllGear.sqf | 40 --- .../agm/Respawn/functions/fn_handleKilled.sqf | 31 -- .../Respawn/functions/fn_handleRespawn.sqf | 25 -- .../Respawn/functions/fn_initRallypoint.sqf | 17 -- TO_MERGE/agm/Respawn/functions/fn_module.sqf | 43 --- .../functions/fn_moduleFriendlyFire.sqf | 28 -- .../Respawn/functions/fn_moduleRallypoint.sqf | 25 -- .../Respawn/functions/fn_moveRallypoint.sqf | 35 --- .../agm/Respawn/functions/fn_removeBody.sqf | 30 -- .../functions/fn_removeDisconnectedPlayer.sqf | 15 - .../agm/Respawn/functions/fn_restoreGear.sqf | 145 --------- .../functions/fn_showFriendlyFireMessage.sqf | 12 - .../functions/fn_teleportToRallypoint.sqf | 27 -- 18 files changed, 768 deletions(-) delete mode 100644 TO_MERGE/agm/Respawn/UI/Icon_Module_FriendlyFire_ca.paa delete mode 100644 TO_MERGE/agm/Respawn/UI/Icon_Module_Rallypoint_ca.paa delete mode 100644 TO_MERGE/agm/Respawn/UI/Icon_Module_Respawn_ca.paa delete mode 100644 TO_MERGE/agm/Respawn/config.cpp delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_canMoveRallypoint.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_getAllGear.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_handleKilled.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_handleRespawn.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_initRallypoint.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_module.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_moduleFriendlyFire.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_moduleRallypoint.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_moveRallypoint.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_removeBody.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_removeDisconnectedPlayer.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_restoreGear.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_showFriendlyFireMessage.sqf delete mode 100644 TO_MERGE/agm/Respawn/functions/fn_teleportToRallypoint.sqf diff --git a/TO_MERGE/agm/Respawn/UI/Icon_Module_FriendlyFire_ca.paa b/TO_MERGE/agm/Respawn/UI/Icon_Module_FriendlyFire_ca.paa deleted file mode 100644 index 200d02732c53ae2c43bebcd292d5e195ef3fe6b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 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 E2Y@s_MF0Q* diff --git a/TO_MERGE/agm/Respawn/UI/Icon_Module_Rallypoint_ca.paa b/TO_MERGE/agm/Respawn/UI/Icon_Module_Rallypoint_ca.paa deleted file mode 100644 index ef6ce002c4af752f1791a57328fcb815e65df842..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 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 Date: Mon, 12 Jan 2015 11:24:58 +0100 Subject: [PATCH 08/15] add script_component.hpp include, add file header --- .../functions/fnc_canMoveRallypoint.sqf | 19 +++++++++++- addons/respawn/functions/fnc_getAllGear.sqf | 25 +++++++++------ addons/respawn/functions/fnc_handleKilled.sqf | 2 ++ .../respawn/functions/fnc_handleRespawn.sqf | 4 ++- .../respawn/functions/fnc_initRallypoint.sqf | 18 ++++++++++- addons/respawn/functions/fnc_module.sqf | 31 ++++++++++++------- .../functions/fnc_moduleFriendlyFire.sqf | 28 +++++++++++------ .../functions/fnc_moduleRallypoint.sqf | 28 +++++++++++------ .../respawn/functions/fnc_moveRallypoint.sqf | 19 +++++++++++- addons/respawn/functions/fnc_removeBody.sqf | 27 ++++++++++------ .../fnc_removeDisconnectedPlayer.sqf | 18 ++++++++++- addons/respawn/functions/fnc_restoreGear.sqf | 26 ++++++++++------ .../functions/fnc_showFriendlyFireMessage.sqf | 19 +++++++++++- .../functions/fnc_teleportToRallypoint.sqf | 20 +++++++++++- 14 files changed, 216 insertions(+), 68 deletions(-) diff --git a/addons/respawn/functions/fnc_canMoveRallypoint.sqf b/addons/respawn/functions/fnc_canMoveRallypoint.sqf index d4607e99127..67a0ea859eb 100644 --- a/addons/respawn/functions/fnc_canMoveRallypoint.sqf +++ b/addons/respawn/functions/fnc_canMoveRallypoint.sqf @@ -1,4 +1,21 @@ -// by commy2 +/* + Name: ACE_Respawn_fnc_canMoveRallypoint + + Author(s): + commy2 + + Description: + checks if a unit can move a rally point + + Parameters: + 0: OBJECT - unit + 1: OBJECT - side + + Returns: + BOOLEAN +*/ + +#include "script_component.hpp" private ["_unit", "_side"]; diff --git a/addons/respawn/functions/fnc_getAllGear.sqf b/addons/respawn/functions/fnc_getAllGear.sqf index 5368dbdd353..d9f3e16b70c 100644 --- a/addons/respawn/functions/fnc_getAllGear.sqf +++ b/addons/respawn/functions/fnc_getAllGear.sqf @@ -1,16 +1,21 @@ /* -Author: bux578 - -Description: -Returns an array containing all items of a given unit - -Arguments: -A player object - -Return value: -An array containing all inventory items + Name: ACE_Respawn_fnc_getAllGear + + Author(s): + bux578 + + Description: + returns an array containing all items of a given unit + + Parameters: + 0: OBJECT - unit + + Returns: + ARRAY */ +#include "script_component.hpp" + private ["_unit", "_allGear"]; _unit = _this select 0; diff --git a/addons/respawn/functions/fnc_handleKilled.sqf b/addons/respawn/functions/fnc_handleKilled.sqf index d37dccf6918..7c6bffccebf 100644 --- a/addons/respawn/functions/fnc_handleKilled.sqf +++ b/addons/respawn/functions/fnc_handleKilled.sqf @@ -15,6 +15,8 @@ VOID */ +#include "script_component.hpp" + private ["_killedUnit"]; _killedUnit = _this select 0; diff --git a/addons/respawn/functions/fnc_handleRespawn.sqf b/addons/respawn/functions/fnc_handleRespawn.sqf index 83490eb7f33..9157576fb4e 100644 --- a/addons/respawn/functions/fnc_handleRespawn.sqf +++ b/addons/respawn/functions/fnc_handleRespawn.sqf @@ -1,5 +1,5 @@ /* - Name: AGM_Respawn_fnc_handleRespawn + Name: ACE_Respawn_fnc_handleRespawn Author(s): bux578 @@ -15,6 +15,8 @@ VOID */ +#include "script_component.hpp" + private ["_respawnedUnit"]; _respawnedUnit = _this select 0; diff --git a/addons/respawn/functions/fnc_initRallypoint.sqf b/addons/respawn/functions/fnc_initRallypoint.sqf index 492e4261137..295c9b00ffd 100644 --- a/addons/respawn/functions/fnc_initRallypoint.sqf +++ b/addons/respawn/functions/fnc_initRallypoint.sqf @@ -1,4 +1,20 @@ -// by commy2 +/* + Name: ACE_Respawn_fnc_initRallypoint + + Author(s): + commy2 + + Description: + init code for rally points + + Parameters: + 0: OBJECT - rally + + Returns: + VOID +*/ + +#include "script_component.hpp" private ["_rallypoint", "_name"]; diff --git a/addons/respawn/functions/fnc_module.sqf b/addons/respawn/functions/fnc_module.sqf index bc957c06092..f7d1277d72e 100644 --- a/addons/respawn/functions/fnc_module.sqf +++ b/addons/respawn/functions/fnc_module.sqf @@ -1,14 +1,23 @@ -/* - * Author: KoffeinFlummi, bux578, CAA-Picard, commy2 - * - * Initializes the respawn module. - * - * Arguments: - * Whatever the module provides. (I dunno.) - * - * Return Value: - * None - */ + /* + Name: ACE_Respawn_fnc_module + + Author(s): + KoffeinFlummi, bux578, CAA-Picard, commy2 + + Description: + initializes the respawn module + + Parameters: + 0: OBJECT - logic + 1: ARRAY - synced units + 2: BOOLEAN - activated + + Returns: + VOID +*/ + +#include "script_component.hpp" + if !(isServer) exitWith {}; _logic = _this select 0; diff --git a/addons/respawn/functions/fnc_moduleFriendlyFire.sqf b/addons/respawn/functions/fnc_moduleFriendlyFire.sqf index b274ed2706a..a7d6ca7e723 100644 --- a/addons/respawn/functions/fnc_moduleFriendlyFire.sqf +++ b/addons/respawn/functions/fnc_moduleFriendlyFire.sqf @@ -1,14 +1,22 @@ /* - * Author: commy2 - * - * Initializes the Friendly Fire Messages module. - * - * Arguments: - * Whatever the module provides. (I dunno.) - * - * Return Value: - * None - */ + Name: ACE_Respawn_fnc_moduleFriendlyFire + + Author(s): + commy2 + + Description: + initializes the Friendly Fire Messages module + + Parameters: + 0: OBJECT - logic + 1: ARRAY - synced units + 2: BOOLEAN - activated + + Returns: + VOID +*/ + +#include "script_component.hpp" _this spawn { _logic = _this select 0; diff --git a/addons/respawn/functions/fnc_moduleRallypoint.sqf b/addons/respawn/functions/fnc_moduleRallypoint.sqf index 62f36fc7546..8ec9efbd091 100644 --- a/addons/respawn/functions/fnc_moduleRallypoint.sqf +++ b/addons/respawn/functions/fnc_moduleRallypoint.sqf @@ -1,15 +1,23 @@ /* - * Author: commy2 - * - * Initializes the Rallypoint module. - * - * Arguments: - * Whatever the module provides. (I dunno.) - * - * Return Value: - * None - */ + Name: ACE_Respawn_fnc_moduleRallypoint + + Author(s): + commy2 + + Description: + initializes the Rallypoint module + + Parameters: + 0: OBJECT - logic + 1: ARRAY - synced units + 2: BOOLEAN - activated + + Returns: + VOID +*/ + #include "script_component.hpp" + _logic = _this select 0; _units = _this select 1; _activated = _this select 2; diff --git a/addons/respawn/functions/fnc_moveRallypoint.sqf b/addons/respawn/functions/fnc_moveRallypoint.sqf index 54665282820..427668bfd0c 100644 --- a/addons/respawn/functions/fnc_moveRallypoint.sqf +++ b/addons/respawn/functions/fnc_moveRallypoint.sqf @@ -1,4 +1,21 @@ -// by commy2 +/* + Name: ACE_Respawn_fnc_moveRallypoint + + Author(s): + commy2 + + Description: + Moves a rallypoint to the player's location + + Parameters: + 0: OBJECT - unit + 1: OBJECT - side + + Returns: + VOID +*/ + +#include "script_component.hpp" _this spawn { _unit = _this select 0; diff --git a/addons/respawn/functions/fnc_removeBody.sqf b/addons/respawn/functions/fnc_removeBody.sqf index c8aaacd4442..80f0b314f03 100644 --- a/addons/respawn/functions/fnc_removeBody.sqf +++ b/addons/respawn/functions/fnc_removeBody.sqf @@ -1,15 +1,22 @@ /* - * Author: bux578 - * - * removes the body - * - * Arguments: - * The body - * - * Return Value: - * None - */ + Name: ACE_Respawn_fnc_removeBody + + Author(s): + bux578 + + Description: + removes a given body + + Parameters: + 0: OBJECT - body + 1: BOOLEAN - forceRemove // not used atm + + Returns: + VOID +*/ +#include "script_component.hpp" + private ["_body", "_forceRemove", "_bodyRemoveTimer"]; _body = _this select 0; diff --git a/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf b/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf index 2ba44ef92ce..a700e5c2575 100644 --- a/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf +++ b/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf @@ -1,4 +1,20 @@ -// by commy2 +/* + Name: ACE_Respawn_fnc_removeDisconnectedPlayer + + Author(s): + commy2 + + Description: + handles the disconnected event + + Parameters: + 0: BOOLEAN - forceRemove // not used atm + + Returns: + VOID +*/ + +#include "script_component.hpp" private ["_forceRemove", "_body"]; diff --git a/addons/respawn/functions/fnc_restoreGear.sqf b/addons/respawn/functions/fnc_restoreGear.sqf index f724e31af1a..d6b30620110 100644 --- a/addons/respawn/functions/fnc_restoreGear.sqf +++ b/addons/respawn/functions/fnc_restoreGear.sqf @@ -1,16 +1,22 @@ /* -Author: bux578 - -Description: -Restores previously saved gear - -Arguments: -A player object, an array containing all gear - -Return value: -An array containing all inventory items + Name: ACE_Respawn_fnc_removeBody + + Author(s): + bux578 + + Description: + Restores previously saved gear + + Parameters: + 0: OBJECT - unit + 1: ARRAY - Array containing all gear + + Returns: + VOID */ +#include "script_component.hpp" + private ["_unit", "_allGear", "_headgear", "_goggles", "_uniform", "_uniformitems", "_vest", "_vestitems", "_backpack", "_backpackitems", "_primaryweapon", "_primaryweaponitems", "_primaryweaponmagazine", "_handgunweapon", "_handgunweaponitems", "_handgunweaponmagazine", "_assigneditems", "_binocular"]; diff --git a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf index e5b8a19217c..94d30628e45 100644 --- a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf +++ b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf @@ -1,4 +1,21 @@ -// by commy2 +/* + Name: ACE_Respawn_fnc_showFriendlyFireMessages + + Author(s): + commy2 + + Description: + shows a message in system chat of who killed who + + Parameters: + 0: OBJECT - unit + 1: OBJECT - killer + + Returns: + VOID +*/ + +#include "script_component.hpp" private ["_unit", "_killer"]; diff --git a/addons/respawn/functions/fnc_teleportToRallypoint.sqf b/addons/respawn/functions/fnc_teleportToRallypoint.sqf index 420865949be..cc2a7272717 100644 --- a/addons/respawn/functions/fnc_teleportToRallypoint.sqf +++ b/addons/respawn/functions/fnc_teleportToRallypoint.sqf @@ -1,4 +1,22 @@ -// by commy2 +/* + Name: ACE_Respawn_fnc_teleportToRallypoint + + Author(s): + commy2 + + Description: + teleports a unit to a rallypoint + + Parameters: + 0: OBJECT - unit + 1: OBJECT - side + 2: BOOLEAN - teleport to base + + Returns: + VOID +*/ + +#include "script_component.hpp" private ["_unit", "_side", "_toBase", "_rallypoint"]; From 07c8b7f4dfb4f9f98606d127d1309e7adf9a568f Mon Sep 17 00:00:00 2001 From: bux578 Date: Mon, 12 Jan 2015 15:12:53 +0100 Subject: [PATCH 09/15] replace version with macro, add missing params --- addons/respawn/config.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp index f193410a4a1..9fa3e49de4d 100644 --- a/addons/respawn/config.cpp +++ b/addons/respawn/config.cpp @@ -6,9 +6,9 @@ class CfgPatches { weapons[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent"}; requiredVersion = 0.60; requiredAddons[] = {"ace_core"}; - version = "0.95"; - versionStr = "0.95"; - versionAr[] = {0,95,0}; + version = QUOTE(VERSION); + versionStr = QUOTE(VERSION); + versionAr[] = {VERSION_AR}; author[] = {"bux578", "commy2"}; authorUrl = "https://github.com/bux578/"; }; @@ -18,3 +18,9 @@ class CfgPatches { #include "CfgAddons.hpp" #include "CfgVehicleClasses.hpp" #include "CfgVehicles.hpp" + +class ACE_Parameters_Boolean { + // Boolean Parameters (0/1) + GVAR(SavePreDeathGear) = 0; + GVAR(RemoveDeadBodiesDisonncected) = 1; +}; From 425be3a6c28c7f69a76b6d758428a1e523d17532 Mon Sep 17 00:00:00 2001 From: bux578 Date: Tue, 13 Jan 2015 15:28:03 +0100 Subject: [PATCH 10/15] fixes and spaces --- addons/respawn/CfgEventHandlers.hpp | 22 ++--- addons/respawn/CfgVehicleClasses.hpp | 6 +- addons/respawn/config.cpp | 27 +++--- .../functions/fnc_canMoveRallypoint.sqf | 8 +- addons/respawn/functions/fnc_getAllGear.sqf | 38 ++++---- addons/respawn/functions/fnc_handleKilled.sqf | 4 +- .../respawn/functions/fnc_handleRespawn.sqf | 2 +- .../respawn/functions/fnc_initRallypoint.sqf | 8 +- addons/respawn/functions/fnc_module.sqf | 32 +++---- .../functions/fnc_moduleFriendlyFire.sqf | 20 ++--- .../functions/fnc_moduleRallypoint.sqf | 2 +- .../respawn/functions/fnc_moveRallypoint.sqf | 50 +++++------ addons/respawn/functions/fnc_removeBody.sqf | 8 +- .../fnc_removeDisconnectedPlayer.sqf | 8 +- addons/respawn/functions/fnc_restoreGear.sqf | 88 +++++++++---------- .../functions/fnc_showFriendlyFireMessage.sqf | 4 +- .../functions/fnc_teleportToRallypoint.sqf | 24 ++--- addons/respawn/functions/script_component.hpp | 1 + 18 files changed, 176 insertions(+), 176 deletions(-) create mode 100644 addons/respawn/functions/script_component.hpp diff --git a/addons/respawn/CfgEventHandlers.hpp b/addons/respawn/CfgEventHandlers.hpp index 687de2a825d..e3e95cb39f3 100644 --- a/addons/respawn/CfgEventHandlers.hpp +++ b/addons/respawn/CfgEventHandlers.hpp @@ -1,20 +1,20 @@ class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); - }; + class ADDON { + init = QUOTE( call COMPILE_FILE(XEH_preInit) ); + }; }; class Extended_Killed_EventHandlers { - class CAManBase { - class GVAR(HandleGear) { - killed = QUOTE( _this call FUNC(handleKilled) ); + class CAManBase { + class GVAR(HandleGear) { + killed = QUOTE( _this call FUNC(handleKilled) ); + }; }; - }; }; class Extended_Respawn_EventHandlers { - class CAManBase { - class GVAR(HandleGear) { - respawn = QUOTE( _this call FUNC(handleRespawn) ); + class CAManBase { + class GVAR(HandleGear) { + respawn = QUOTE( _this call FUNC(handleRespawn) ); + }; }; - }; }; diff --git a/addons/respawn/CfgVehicleClasses.hpp b/addons/respawn/CfgVehicleClasses.hpp index 2907b719e97..8d4eeb139ca 100644 --- a/addons/respawn/CfgVehicleClasses.hpp +++ b/addons/respawn/CfgVehicleClasses.hpp @@ -1,5 +1,5 @@ class CfgVehicleClasses { - class GVAR(Rallypoints) { - displayName = "ACE Respawn"; - }; + class GVAR(Rallypoints) { + displayName = "ACE Respawn"; + }; }; diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp index 9fa3e49de4d..c9c999e6bdf 100644 --- a/addons/respawn/config.cpp +++ b/addons/respawn/config.cpp @@ -1,17 +1,17 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent"}; - requiredVersion = 0.60; - requiredAddons[] = {"ace_core"}; - version = QUOTE(VERSION); - versionStr = QUOTE(VERSION); - versionAr[] = {VERSION_AR}; - author[] = {"bux578", "commy2"}; - authorUrl = "https://github.com/bux578/"; - }; + class ADDON { + units[] = {}; + weapons[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent"}; + requiredVersion = 0.60; + requiredAddons[] = {"ace_core"}; + version = QUOTE(VERSION); + versionStr = QUOTE(VERSION); + versionAr[] = {VERSION_AR}; + author[] = {"bux578", "commy2"}; + authorUrl = "https://github.com/bux578/"; + }; }; #include "CfgEventHandlers.hpp" @@ -20,7 +20,6 @@ class CfgPatches { #include "CfgVehicles.hpp" class ACE_Parameters_Boolean { - // Boolean Parameters (0/1) - GVAR(SavePreDeathGear) = 0; - GVAR(RemoveDeadBodiesDisonncected) = 1; + GVAR(SavePreDeathGear) = 0; + GVAR(RemoveDeadBodiesDisonncected) = 1; }; diff --git a/addons/respawn/functions/fnc_canMoveRallypoint.sqf b/addons/respawn/functions/fnc_canMoveRallypoint.sqf index 67a0ea859eb..e6f91a256f6 100644 --- a/addons/respawn/functions/fnc_canMoveRallypoint.sqf +++ b/addons/respawn/functions/fnc_canMoveRallypoint.sqf @@ -26,8 +26,8 @@ _side = _this select 1; _unit getVariable ["ACE_canMoveRallypoint"), false] && {!isNull ([ - objNull, - missionNamespace getVariable ["ACE_Rallypoint_West", objNull], - missionNamespace getVariable ["ACE_Rallypoint_East", objNull], - missionNamespace getVariable ["ACE_Rallypoint_Independent", objNull] + objNull, + missionNamespace getVariable ["ACE_Rallypoint_West", objNull], + missionNamespace getVariable ["ACE_Rallypoint_East", objNull], + missionNamespace getVariable ["ACE_Rallypoint_Independent", objNull] ] select ([west, east, independent] find _side) + 1)} diff --git a/addons/respawn/functions/fnc_getAllGear.sqf b/addons/respawn/functions/fnc_getAllGear.sqf index d9f3e16b70c..ad9f3dbb686 100644 --- a/addons/respawn/functions/fnc_getAllGear.sqf +++ b/addons/respawn/functions/fnc_getAllGear.sqf @@ -21,25 +21,25 @@ private ["_unit", "_allGear"]; _unit = _this select 0; _allGear = [ - (headgear _unit), - (goggles _unit), - (uniform _unit), - (uniformItems _unit), - (vest _unit), - (vestItems _unit), - (backpack _unit), - (backpackItems _unit), - (primaryWeapon _unit), - (primaryWeaponItems _unit), - (primaryWeaponMagazine _unit), - (secondaryWeapon _unit), - (secondaryWeaponItems _unit), - (secondaryWeaponMagazine _unit), - (handgunWeapon _unit), - (handgunItems _unit), - (handgunMagazine _unit), - (assignedItems _unit), - (binocular _unit) + (headgear _unit), + (goggles _unit), + (uniform _unit), + (uniformItems _unit), + (vest _unit), + (vestItems _unit), + (backpack _unit), + (backpackItems _unit), + (primaryWeapon _unit), + (primaryWeaponItems _unit), + (primaryWeaponMagazine _unit), + (secondaryWeapon _unit), + (secondaryWeaponItems _unit), + (secondaryWeaponMagazine _unit), + (handgunWeapon _unit), + (handgunItems _unit), + (handgunMagazine _unit), + (assignedItems _unit), + (binocular _unit) ]; _allGear diff --git a/addons/respawn/functions/fnc_handleKilled.sqf b/addons/respawn/functions/fnc_handleKilled.sqf index 7c6bffccebf..b64a5465fb4 100644 --- a/addons/respawn/functions/fnc_handleKilled.sqf +++ b/addons/respawn/functions/fnc_handleKilled.sqf @@ -25,9 +25,9 @@ _killedUnit = _this select 0; GVAR(unitGear) = []; if (GVAR(SavePreDeathGear)) then { - GVAR(unitGear) = [_killedUnit] call FUNC(getAllGear); + GVAR(unitGear) = [_killedUnit] call FUNC(getAllGear); }; if (missionNamespace getVariable [QGVAR(showFriendlyFireMessage), false]) then { - [_this, FUNC(showFriendlyFireMessage), 2] call EFUNC(Core, execRemoteFnc); + [_this, FUNC(showFriendlyFireMessage), 2] call EFUNC(Core,execRemoteFnc); }; diff --git a/addons/respawn/functions/fnc_handleRespawn.sqf b/addons/respawn/functions/fnc_handleRespawn.sqf index 9157576fb4e..a9fe3293ac0 100644 --- a/addons/respawn/functions/fnc_handleRespawn.sqf +++ b/addons/respawn/functions/fnc_handleRespawn.sqf @@ -23,5 +23,5 @@ _respawnedUnit = _this select 0; // Restores the gear when the player respawns if (GVAR(SavePreDeathGear)) then { - [_respawnedUnit, GVAR(unitGear)] call FUNC(restoreGear); + [_respawnedUnit, GVAR(unitGear)] call FUNC(restoreGear); }; diff --git a/addons/respawn/functions/fnc_initRallypoint.sqf b/addons/respawn/functions/fnc_initRallypoint.sqf index 295c9b00ffd..cb4d55146f5 100644 --- a/addons/respawn/functions/fnc_initRallypoint.sqf +++ b/addons/respawn/functions/fnc_initRallypoint.sqf @@ -25,9 +25,9 @@ if (!local _rallypoint) exitWith {}; _name = typeOf _rallypoint; if (isNil _name) then { - missionNamespace setVariable [_name, _rallypoint]; - publicVariable _name; + missionNamespace setVariable [_name, _rallypoint]; + publicVariable _name; } else { - deleteVehicle _rallypoint; - diag_log text "[ACE] Respawn: ERROR Multiple Rallypoints of same type."; + deleteVehicle _rallypoint; + diag_log text "[ACE] Respawn: ERROR Multiple Rallypoints of same type."; }; diff --git a/addons/respawn/functions/fnc_module.sqf b/addons/respawn/functions/fnc_module.sqf index f7d1277d72e..28cb68e8896 100644 --- a/addons/respawn/functions/fnc_module.sqf +++ b/addons/respawn/functions/fnc_module.sqf @@ -27,26 +27,26 @@ if !(_activated) exitWith {}; GVAR(Module) = true; -[_logic, QGVAR(SavePreDeathGear), "SavePreDeathGear"] call EFUNC(Core, readBooleanParameterFromModule); -[_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(Core, readBooleanParameterFromModule); +[_logic, QGVAR(SavePreDeathGear), "SavePreDeathGear"] call EFUNC(Core,readBooleanParameterFromModule); +[_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(Core,readBooleanParameterFromModule); if (isServer) then { - if (GVAR(RemoveDeadBodiesDisonncected)) then { - _fnc_deleteDisconnected = { - _this spawn { - _unit = _this select 0; - - sleep 4; - - if (!alive _unit) then { - deleteVehicle _unit; + if (GVAR(RemoveDeadBodiesDisonncected)) then { + _fnc_deleteDisconnected = { + _this spawn { + _unit = _this select 0; + + sleep 4; + + if (!alive _unit) then { + deleteVehicle _unit; + }; + }; + false }; - }; - false - }; - addMissionEventHandler ["HandleDisconnect", _fnc_deleteDisconnected]; - }; + addMissionEventHandler ["HandleDisconnect", _fnc_deleteDisconnected]; + }; }; diag_log text "[ACE]: Respawn Module Initialized."; diff --git a/addons/respawn/functions/fnc_moduleFriendlyFire.sqf b/addons/respawn/functions/fnc_moduleFriendlyFire.sqf index a7d6ca7e723..35857b43e4e 100644 --- a/addons/respawn/functions/fnc_moduleFriendlyFire.sqf +++ b/addons/respawn/functions/fnc_moduleFriendlyFire.sqf @@ -19,18 +19,18 @@ #include "script_component.hpp" _this spawn { - _logic = _this select 0; - _units = _this select 1; - _activated = _this select 2; + _logic = _this select 0; + _units = _this select 1; + _activated = _this select 2; - if !(_activated) exitWith {}; + if !(_activated) exitWith {}; - if (isServer) then { - _varName = QGVAR(showFriendlyFireMessage); + if (isServer) then { + _varName = QGVAR(showFriendlyFireMessage); - missionNamespace setVariable [_varName, true]; - publicVariable _varName; - }; + missionNamespace setVariable [_varName, true]; + publicVariable _varName; + }; - diag_log text "[ACE]: Friendly Fire Messages Module Initialized."; + diag_log text "[ACE]: Friendly Fire Messages Module Initialized."; }; diff --git a/addons/respawn/functions/fnc_moduleRallypoint.sqf b/addons/respawn/functions/fnc_moduleRallypoint.sqf index 8ec9efbd091..1646fa72da4 100644 --- a/addons/respawn/functions/fnc_moduleRallypoint.sqf +++ b/addons/respawn/functions/fnc_moduleRallypoint.sqf @@ -25,7 +25,7 @@ _activated = _this select 2; if !(_activated) exitWith {}; { - _x setVariable ["ACE_canMoveRallypoint", true]; + _x setVariable ["ACE_canMoveRallypoint", true]; } forEach _units; diag_log text "[ACE]: Rallypoint Module Initialized."; diff --git a/addons/respawn/functions/fnc_moveRallypoint.sqf b/addons/respawn/functions/fnc_moveRallypoint.sqf index 427668bfd0c..788031fcf3c 100644 --- a/addons/respawn/functions/fnc_moveRallypoint.sqf +++ b/addons/respawn/functions/fnc_moveRallypoint.sqf @@ -18,37 +18,37 @@ #include "script_component.hpp" _this spawn { - _unit = _this select 0; - _side = _this select 1; + _unit = _this select 0; + _side = _this select 1; - // rallypoint names are defined in CfgVehicles.hpp - - _rallypoint = [ - objNull, - missionNamespace getVariable ["ACE_Rallypoint_West", objNull], - missionNamespace getVariable ["ACE_RallypointExit_East", objNull], - missionNamespace getVariable ["ACE_RallypointExit_Independent", objNull] - ] select ([west, east, independent] find _side) + 1; + // rallypoint names are defined in CfgVehicles.hpp + + _rallypoint = [ + objNull, + missionNamespace getVariable ["ACE_Rallypoint_West", objNull], + missionNamespace getVariable ["ACE_RallypointExit_East", objNull], + missionNamespace getVariable ["ACE_RallypointExit_Independent", objNull] + ] select ([west, east, independent] find _side) + 1; - if (isNull _rallypoint) exitWith {}; + if (isNull _rallypoint) exitWith {}; - _position = getPosATL _unit; - _position = _position findEmptyPosition [0, 2, typeOf _rallypoint]; - if (count _position == 0) then {_position = getPosATL _unit}; + _position = getPosATL _unit; + _position = _position findEmptyPosition [0, 2, typeOf _rallypoint]; + if (count _position == 0) then {_position = getPosATL _unit}; - _position set [2, 0]; + _position set [2, 0]; - [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core, displayTextStructured); + [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core,displayTextStructured); - sleep 5; - _rallypoint setPosATL _position; - _unit reveal _rallypoint; + sleep 5; + _rallypoint setPosATL _position; + _unit reveal _rallypoint; - /* - _marker = format ["AGM_RallyPoint_%1", _side]; - _marker setMarkerPos _position; - _marker setMarkerTextLocal format ["%1:%2", [date select 3, 2, 0] call CBA_fnc_FORMATNumber, [date select 4, 2, 0] call CBA_fnc_FORMATNumber]; - */ + /* + _marker = format ["AGM_RallyPoint_%1", _side]; + _marker setMarkerPos _position; + _marker setMarkerTextLocal format ["%1:%2", [date select 3, 2, 0] call CBA_fnc_FORMATNumber, [date select 4, 2, 0] call CBA_fnc_FORMATNumber]; + */ - [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core, displayTextStructured); + [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core,displayTextStructured); }; diff --git a/addons/respawn/functions/fnc_removeBody.sqf b/addons/respawn/functions/fnc_removeBody.sqf index 80f0b314f03..5c3ed14988e 100644 --- a/addons/respawn/functions/fnc_removeBody.sqf +++ b/addons/respawn/functions/fnc_removeBody.sqf @@ -30,8 +30,8 @@ if (_forceRemove) then { }; [_body, _bodyRemoveTimer] spawn { - sleep (_this select 1); - // hideBody takes ~20s till body is fully underground - // a better hideBody would make this more aesthetic - deleteVehicle (_this select 0); + sleep (_this select 1); + // hideBody takes ~20s till body is fully underground + // a better hideBody would make this more aesthetic + deleteVehicle (_this select 0); }; diff --git a/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf b/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf index a700e5c2575..492cd990a4e 100644 --- a/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf +++ b/addons/respawn/functions/fnc_removeDisconnectedPlayer.sqf @@ -21,11 +21,11 @@ private ["_forceRemove", "_body"]; _forceRemove = _this select 0; { - if (getPlayerUID _x == _uid) exitWith { - _body = _x; - }; + if (getPlayerUID _x == _uid) exitWith { + _body = _x; + }; } forEach playableUnits; if (!isNil "_body" && {!alive _body}) then { - [_body, _forceRemove] call FUNC(removeBody); + [_body, _forceRemove] call FUNC(removeBody); }; diff --git a/addons/respawn/functions/fnc_restoreGear.sqf b/addons/respawn/functions/fnc_restoreGear.sqf index d6b30620110..18afba344be 100644 --- a/addons/respawn/functions/fnc_restoreGear.sqf +++ b/addons/respawn/functions/fnc_restoreGear.sqf @@ -56,85 +56,85 @@ _binocular = _allGear select 18; // start restoring the items if (_headgear != "") then { - _unit addHeadgear _headgear; + _unit addHeadgear _headgear; }; if (_uniform != "") then { - _unit forceAddUniform _uniform; + _unit forceAddUniform _uniform; }; if (_vest != "") then { - _unit addVest _vest; + _unit addVest _vest; }; if (_goggles != "") then { - _unit addGoggles _goggles; + _unit addGoggles _goggles; }; { - _unit addItemToUniform _x; + _unit addItemToUniform _x; }forEach _uniformitems; { - _unit addItemToVest _x; + _unit addItemToVest _x; }forEach _vestitems; if(format["%1", _backpack] != "") then { - _unit addBackpack _backpack; - - _backpa = unitBackpack _unit; - clearMagazineCargoGlobal _backpa; - clearWeaponCargoGlobal _backpa; - clearItemCargoGlobal _backpa; - { - _unit addItemToBackpack _x; - } forEach _backpackitems; + _unit addBackpack _backpack; + + _backpa = unitBackpack _unit; + clearMagazineCargoGlobal _backpa; + clearWeaponCargoGlobal _backpa; + clearItemCargoGlobal _backpa; + { + _unit addItemToBackpack _x; + } forEach _backpackitems; }; // primaryWeapon if (_primaryweapon != "") then { - { - _unit addMagazine _x; - } forEach _primaryweaponmagazine; + { + _unit addMagazine _x; + } forEach _primaryweaponmagazine; - _unit addWeapon _primaryweapon; + _unit addWeapon _primaryweapon; - { - if (_x != "") then { - _unit addPrimaryWeaponItem _x; - }; - } forEach _primaryweaponitems; + { + if (_x != "") then { + _unit addPrimaryWeaponItem _x; + }; + } forEach _primaryweaponitems; }; // secondaryWeapon if (_secondaryweapon != "") then { - { - _unit addMagazine _x; - } forEach _secondaryweaponmagazine; + { + _unit addMagazine _x; + } forEach _secondaryweaponmagazine; - _unit addWeapon _secondaryweapon; + _unit addWeapon _secondaryweapon; - { - if (_x != "") then { - _unit addSecondaryWeaponItem _x; - }; - } forEach _secondaryweaponitems; + { + if (_x != "") then { + _unit addSecondaryWeaponItem _x; + }; + } forEach _secondaryweaponitems; }; // handgun if (_handgunweapon != "") then { - { - _unit addMagazine _x; - } forEach _handgunweaponmagazine; + { + _unit addMagazine _x; + } forEach _handgunweaponmagazine; - _unit addWeapon _handgunweapon; + _unit addWeapon _handgunweapon; - { - if (_x != "") then { - _unit addHandgunItem _x; - }; - } forEach _handgunweaponitems; + { + if (_x != "") then { + _unit addHandgunItem _x; + }; + } forEach _handgunweaponitems; }; @@ -146,6 +146,6 @@ _assignedItems = _assignedItems - [_binocular]; _unit addWeapon _binocular; if ("Laserdesignator" in assignedItems _unit) then { - _unit selectWeapon "Laserdesignator"; - if (currentMagazine _unit == "") then {_unit addMagazine "Laserbatteries";}; + _unit selectWeapon "Laserdesignator"; + if (currentMagazine _unit == "") then {_unit addMagazine "Laserbatteries";}; }; diff --git a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf index 94d30628e45..145792feffe 100644 --- a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf +++ b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf @@ -23,7 +23,7 @@ _unit = _this select 0; _killer = _this select 1; if (_unit != _killer && side group _unit in [side group ACE_player, civilian] && {side group _killer == side group ACE_player}) then { - systemChat format ["%1 was killed by %2", [_unit] call EFUNC(Core, getName), [_killer] call EFUNC(Core, getName)]; + systemChat format ["%1 was killed by %2", [_unit] call EFUNC(Core,getName), [_killer] call EFUNC(Core,getName)]; - [_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(Core, callCustomEventHandlers); + [_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(Core,callCustomEventHandlers); }; diff --git a/addons/respawn/functions/fnc_teleportToRallypoint.sqf b/addons/respawn/functions/fnc_teleportToRallypoint.sqf index cc2a7272717..0bb262239ae 100644 --- a/addons/respawn/functions/fnc_teleportToRallypoint.sqf +++ b/addons/respawn/functions/fnc_teleportToRallypoint.sqf @@ -27,18 +27,18 @@ _toBase = _this select 2; // rallypoint names are defined in CfgVehicles.hpp _rallypoint = ([ - [ - objNull, - missionNamespace getVariable ["ACE_RallypointExit_West", objNull], - missionNamespace getVariable ["ACE_RallypointExit_East", objNull], - missionNamespace getVariable ["ACE_RallypointExit_Independent", objNull] - ], - [ - objNull, - missionNamespace getVariable ["ACE_Rallypoint_West", objNull], - missionNamespace getVariable ["ACE_Rallypoint_East", objNull], - missionNamespace getVariable ["ACE_Rallypoint_Independent", objNull] - ] + [ + objNull, + missionNamespace getVariable ["ACE_RallypointExit_West", objNull], + missionNamespace getVariable ["ACE_RallypointExit_East", objNull], + missionNamespace getVariable ["ACE_RallypointExit_Independent", objNull] + ], + [ + objNull, + missionNamespace getVariable ["ACE_Rallypoint_West", objNull], + missionNamespace getVariable ["ACE_Rallypoint_East", objNull], + missionNamespace getVariable ["ACE_Rallypoint_Independent", objNull] + ] ] select _toBase) select ([west, east, independent] find _side) + 1; if (isNull _rallypoint) exitWith {}; diff --git a/addons/respawn/functions/script_component.hpp b/addons/respawn/functions/script_component.hpp new file mode 100644 index 00000000000..eeb32a47bdf --- /dev/null +++ b/addons/respawn/functions/script_component.hpp @@ -0,0 +1 @@ +#include "\z\ace\addons\respawn\script_component.hpp" \ No newline at end of file From 2074e200d5aa4d52662fcd7762f30935782a1928 Mon Sep 17 00:00:00 2001 From: bux578 Date: Tue, 13 Jan 2015 15:33:29 +0100 Subject: [PATCH 11/15] icon path fix --- addons/respawn/CfgVehicles.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index 51f4e919ecd..d8f10c2e476 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -7,7 +7,7 @@ class CfgVehicles { function = FUNC(module); scope = 2; isGlobal = 1; - icon = PATHTOF(UI\Icon_Module_Respawn_ca.paa); + icon = QUOTE(PATHTOF(UI\IconSwitchUnits_ca.paa)); class Arguments { class SavePreDeathGear { displayName = "Save Gear?"; @@ -49,7 +49,7 @@ class CfgVehicles { function = FUNC(moduleRallypoint); scope = 2; isGlobal = 1; - icon = PATHTOF(UI\Icon_Module_Rallypoint_ca.paa); + icon = QUOTE(PATHTOF(UI\IconSwitchUnits_ca.paa)); class Arguments { }; }; From 41f843514ffb981f74855f333dabc61ffc412f2b Mon Sep 17 00:00:00 2001 From: bux578 Date: Tue, 13 Jan 2015 15:38:17 +0100 Subject: [PATCH 12/15] 4 spaces --- addons/respawn/CfgAddons.hpp | 6 +- addons/respawn/CfgEventHandlers.hpp | 6 +- addons/respawn/CfgVehicles.hpp | 364 ++++++++++++++-------------- addons/respawn/config.cpp | 8 +- 4 files changed, 192 insertions(+), 192 deletions(-) diff --git a/addons/respawn/CfgAddons.hpp b/addons/respawn/CfgAddons.hpp index 910dc2ac4f5..2793ac09da6 100644 --- a/addons/respawn/CfgAddons.hpp +++ b/addons/respawn/CfgAddons.hpp @@ -1,5 +1,5 @@ class CfgAddons { - class GVAR(Rallypoints) { - list[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent"}; - }; + class GVAR(Rallypoints) { + list[] = { "ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent" }; + }; }; diff --git a/addons/respawn/CfgEventHandlers.hpp b/addons/respawn/CfgEventHandlers.hpp index e3e95cb39f3..c4a50615d1b 100644 --- a/addons/respawn/CfgEventHandlers.hpp +++ b/addons/respawn/CfgEventHandlers.hpp @@ -1,20 +1,20 @@ class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE( call COMPILE_FILE(XEH_preInit) ); + init = QUOTE(call COMPILE_FILE(XEH_preInit)); }; }; class Extended_Killed_EventHandlers { class CAManBase { class GVAR(HandleGear) { - killed = QUOTE( _this call FUNC(handleKilled) ); + killed = QUOTE(_this call FUNC(handleKilled)); }; }; }; class Extended_Respawn_EventHandlers { class CAManBase { class GVAR(HandleGear) { - respawn = QUOTE( _this call FUNC(handleRespawn) ); + respawn = QUOTE(_this call FUNC(handleRespawn)); }; }; }; diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index d8f10c2e476..665ea1865d9 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -1,206 +1,206 @@ class CfgVehicles { - class Module_F; - class ACE_ModuleRespawn: Module_F { - author = "$STR_ACE_Core_ACETeam"; - category = "ACE"; - displayName = "Respawn System"; - function = FUNC(module); - scope = 2; - isGlobal = 1; - icon = QUOTE(PATHTOF(UI\IconSwitchUnits_ca.paa)); - class Arguments { - class SavePreDeathGear { - displayName = "Save Gear?"; - description = "Respawn with the gear a soldier had just before his death?"; - typeName = "BOOL"; - class values { - class Yes { name = "Yes"; value = 1;}; - class No { default = 1; name = "No"; value = 0; }; - }; - }; - class RemoveDeadBodiesDisonncected { - displayName = "Remove bodies?"; - description = "Remove player bodies after disconnect?"; - typeName = "BOOL"; - class values { - class Yes { default = 1; name = "Yes"; value = 1;}; - class No { name = "No"; value = 0; }; - }; - }; - }; - }; - - class ACE_ModuleFriendlyFire: Module_F { - author = "$STR_ACE_Core_ACETeam"; - category = "ACE"; - displayName = "Friendly Fire Messages"; - function = FUNC(moduleFriendlyFire); - scope = 2; - isGlobal = 1; - icon = PATHTOF(UI\Icon_Module_FriendlyFire_ca.paa); - class Arguments { - }; - }; - - class ACE_ModuleRallypoint: Module_F { - author = "$STR_ACE_Core_ACETeam"; - category = "ACE"; - displayName = "Rallypoint System"; - function = FUNC(moduleRallypoint); - scope = 2; - isGlobal = 1; - icon = QUOTE(PATHTOF(UI\IconSwitchUnits_ca.paa)); - class Arguments { + class Module_F; + class ACE_ModuleRespawn : Module_F { + author = "$STR_ACE_Core_ACETeam"; + category = "ACE"; + displayName = "Respawn System"; + function = FUNC(module); + scope = 2; + isGlobal = 1; + icon = QUOTE(PATHTOF(UI\IconSwitchUnits_ca.paa)); + class Arguments { + class SavePreDeathGear { + displayName = "Save Gear?"; + description = "Respawn with the gear a soldier had just before his death?"; + typeName = "BOOL"; + class values { + class Yes { name = "Yes"; value = 1; }; + class No { default = 1; name = "No"; value = 0; }; + }; + }; + class RemoveDeadBodiesDisonncected { + displayName = "Remove bodies?"; + description = "Remove player bodies after disconnect?"; + typeName = "BOOL"; + class values { + class Yes { default = 1; name = "Yes"; value = 1; }; + class No { name = "No"; value = 0; }; + }; + }; + }; }; - }; - - // rallypoints - class FlagCarrier; - class Flag_NATO_F: FlagCarrier { - class ACE_Actions; - }; - - class Flag_CSAT_F: FlagCarrier { - class ACE_Actions; - }; - - class Flag_AAF_F: FlagCarrier { - class ACE_Actions; - }; - - // static - class ACE_Rallypoint_West: Flag_NATO_F { - author = "$STR_ACE_Core_ACETeam"; - displayName = "Rallypoint West Base"; - vehicleClass = QGVAR(Rallypoints); - - class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint)); + + class ACE_ModuleFriendlyFire : Module_F { + author = "$STR_ACE_Core_ACETeam"; + category = "ACE"; + displayName = "Friendly Fire Messages"; + function = FUNC(moduleFriendlyFire); + scope = 2; + isGlobal = 1; + icon = PATHTOF(UI\Icon_Module_FriendlyFire_ca.paa); + class Arguments { + }; }; - class ACE_Actions: ACE_Actions { - class ACE_Teleport { - displayName = "Teleport to Rallypoint"; - distance = 4; - condition = QUOTE( side group _player == west ); - statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); ); - showDisabled = 1; - priority = 1; - }; + + class ACE_ModuleRallypoint : Module_F { + author = "$STR_ACE_Core_ACETeam"; + category = "ACE"; + displayName = "Rallypoint System"; + function = FUNC(moduleRallypoint); + scope = 2; + isGlobal = 1; + icon = QUOTE(PATHTOF(UI\IconSwitchUnits_ca.paa)); + class Arguments { + }; }; - }; - class ACE_Rallypoint_East: Flag_CSAT_F { - author = "$STR_ACE_Core_ACETeam"; - displayName = "Rallypoint East Base"; - vehicleClass = QGVAR(Rallypoints); + // rallypoints + class FlagCarrier; + class Flag_NATO_F : FlagCarrier { + class ACE_Actions; + }; - class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint)); + class Flag_CSAT_F : FlagCarrier { + class ACE_Actions; }; - class ACE_Actions: ACE_Actions { - class ACE_Teleport { - displayName = "Teleport to Rallypoint"; - distance = 4; - condition = QUOTE( side group _player == east ); - statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); ); - showDisabled = 1; - priority = 1; - }; + + class Flag_AAF_F : FlagCarrier { + class ACE_Actions; }; - }; - class ACE_Rallypoint_Independent: Flag_AAF_F { - author = "$STR_ACE_Core_ACETeam"; - displayName = "Rallypoint Independent Base"; - vehicleClass = QGVAR(Rallypoints); + // static + class ACE_Rallypoint_West : Flag_NATO_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint West Base"; + vehicleClass = QGVAR(Rallypoints); - class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint)); - }; - class ACE_Actions: ACE_Actions { - class ACE_Teleport { - displayName = "Teleport to Rallypoint"; - distance = 4; - condition = QUOTE( side group _player == independent ); - statement = QUOTE( [_player, side group _player, false] call FUNC(teleportToRallypoint); ); - showDisabled = 1; - priority = 1; - }; + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint)); + }; + class ACE_Actions : ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Rallypoint"; + distance = 4; + condition = QUOTE(side group _player == west); + statement = QUOTE([_player, side group _player, false] call FUNC(teleportToRallypoint);); + showDisabled = 1; + priority = 1; + }; + }; }; - }; - // moveable - class ACE_RallypointExit_West: Flag_NATO_F { - author = "$STR_ACE_Core_ACETeam"; - displayName = "Rallypoint West"; - vehicleClass = QGVAR(Rallypoints); + class ACE_Rallypoint_East : Flag_CSAT_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint East Base"; + vehicleClass = QGVAR(Rallypoints); - class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint)); - }; - class ACE_Actions: ACE_Actions { - class ACE_Teleport { - displayName = "Teleport to Base"; - distance = 4; - condition = QUOTE( side group _player == west ); - statement = QUOTE( [_player, side group _player, true] call FUNC(teleportToRallypoint); ); - showDisabled = 1; - priority = 1; - }; + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint)); + }; + class ACE_Actions : ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Rallypoint"; + distance = 4; + condition = QUOTE(side group _player == east); + statement = QUOTE([_player, side group _player, false] call FUNC(teleportToRallypoint);); + showDisabled = 1; + priority = 1; + }; + }; }; - }; - class ACE_RallypointExit_East: Flag_CSAT_F { - author = "$STR_ACE_Core_ACETeam"; - displayName = "Rallypoint East"; - vehicleClass = QGVAR(Rallypoints); + class ACE_Rallypoint_Independent : Flag_AAF_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint Independent Base"; + vehicleClass = QGVAR(Rallypoints); - class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint)); + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint)); + }; + class ACE_Actions : ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Rallypoint"; + distance = 4; + condition = QUOTE(side group _player == independent); + statement = QUOTE([_player, side group _player, false] call FUNC(teleportToRallypoint);); + showDisabled = 1; + priority = 1; + }; + }; }; - class ACE_Actions: ACE_Actions { - class ACE_Teleport { - displayName = "Teleport to Base"; - distance = 4; - condition = QUOTE( side group _player == east ); - statement = QUOTE( [_player, side group _player, true] call FUNC(teleportToRallypoint); ); - showDisabled = 1; - priority = 1; - }; + + // moveable + class ACE_RallypointExit_West : Flag_NATO_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint West"; + vehicleClass = QGVAR(Rallypoints); + + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint)); + }; + class ACE_Actions : ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Base"; + distance = 4; + condition = QUOTE(side group _player == west); + statement = QUOTE([_player, side group _player, true] call FUNC(teleportToRallypoint);); + showDisabled = 1; + priority = 1; + }; + }; }; - }; - class ACE_RallypointExit_Independent: Flag_AAF_F { - author = "$STR_ACE_Core_ACETeam"; - displayName = "Rallypoint Independent"; - vehicleClass = QGVAR(Rallypoints); + class ACE_RallypointExit_East : Flag_CSAT_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint East"; + vehicleClass = QGVAR(Rallypoints); - class EventHandlers { - init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint)); + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint)); + }; + class ACE_Actions : ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Base"; + distance = 4; + condition = QUOTE(side group _player == east); + statement = QUOTE([_player, side group _player, true] call FUNC(teleportToRallypoint);); + showDisabled = 1; + priority = 1; + }; + }; }; - class ACE_Actions: ACE_Actions { - class ACE_Teleport { - displayName = "Teleport to Base"; - distance = 4; - condition = QUOTE( side group _player == independent ); - statement = QUOTE( [_player, side group _player, true] call FUNC(teleportToRallypoint); ); - showDisabled = 1; - priority = 1; - }; + + class ACE_RallypointExit_Independent : Flag_AAF_F { + author = "$STR_ACE_Core_ACETeam"; + displayName = "Rallypoint Independent"; + vehicleClass = QGVAR(Rallypoints); + + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint)); + }; + class ACE_Actions : ACE_Actions { + class ACE_Teleport { + displayName = "Teleport to Base"; + distance = 4; + condition = QUOTE(side group _player == independent); + statement = QUOTE([_player, side group _player, true] call FUNC(teleportToRallypoint);); + showDisabled = 1; + priority = 1; + }; + }; }; - }; - - // team leader - class Man; - class CAManBase: Man { - class ACE_SelfActions { - class ACE_MoveRallypoint { - displayName = "Move Rallypoint"; - condition = QUOTE( [_player, side group _player] call FUNC(canMoveRallypoint) ); - statement = QUOTE( [_player, side group _player] call FUNC(moveRallypoint) ); - showDisabled = 0; - priority = -0.5; - }; + + // team leader + class Man; + class CAManBase : Man { + class ACE_SelfActions { + class ACE_MoveRallypoint { + displayName = "Move Rallypoint"; + condition = QUOTE([_player, side group _player] call FUNC(canMoveRallypoint)); + statement = QUOTE([_player, side group _player] call FUNC(moveRallypoint)); + showDisabled = 0; + priority = -0.5; + }; + }; }; - }; }; diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp index c9c999e6bdf..6f8ea1ceb20 100644 --- a/addons/respawn/config.cpp +++ b/addons/respawn/config.cpp @@ -3,13 +3,13 @@ class CfgPatches { class ADDON { units[] = {}; - weapons[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent"}; + weapons[] = { "ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent" }; requiredVersion = 0.60; - requiredAddons[] = {"ace_core"}; + requiredAddons[] = { "ace_core" }; version = QUOTE(VERSION); versionStr = QUOTE(VERSION); - versionAr[] = {VERSION_AR}; - author[] = {"bux578", "commy2"}; + versionAr[] = { VERSION_AR }; + author[] = { "bux578", "commy2" }; authorUrl = "https://github.com/bux578/"; }; }; From 67c3c7e7c3a35823d1e065a7daa589387acc418e Mon Sep 17 00:00:00 2001 From: bux578 Date: Tue, 13 Jan 2015 16:29:35 +0100 Subject: [PATCH 13/15] core -> common --- addons/respawn/CfgVehicles.hpp | 18 +++++++++--------- addons/respawn/config.cpp | 2 +- addons/respawn/functions/fnc_handleKilled.sqf | 2 +- addons/respawn/functions/fnc_module.sqf | 4 ++-- .../respawn/functions/fnc_moveRallypoint.sqf | 4 ++-- .../functions/fnc_showFriendlyFireMessage.sqf | 4 ++-- .../functions/fnc_teleportToRallypoint.sqf | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index 665ea1865d9..55a18ad4787 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -1,7 +1,7 @@ class CfgVehicles { class Module_F; class ACE_ModuleRespawn : Module_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Respawn System"; function = FUNC(module); @@ -31,7 +31,7 @@ class CfgVehicles { }; class ACE_ModuleFriendlyFire : Module_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Friendly Fire Messages"; function = FUNC(moduleFriendlyFire); @@ -43,7 +43,7 @@ class CfgVehicles { }; class ACE_ModuleRallypoint : Module_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Rallypoint System"; function = FUNC(moduleRallypoint); @@ -70,7 +70,7 @@ class CfgVehicles { // static class ACE_Rallypoint_West : Flag_NATO_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; displayName = "Rallypoint West Base"; vehicleClass = QGVAR(Rallypoints); @@ -90,7 +90,7 @@ class CfgVehicles { }; class ACE_Rallypoint_East : Flag_CSAT_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; displayName = "Rallypoint East Base"; vehicleClass = QGVAR(Rallypoints); @@ -110,7 +110,7 @@ class CfgVehicles { }; class ACE_Rallypoint_Independent : Flag_AAF_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; displayName = "Rallypoint Independent Base"; vehicleClass = QGVAR(Rallypoints); @@ -131,7 +131,7 @@ class CfgVehicles { // moveable class ACE_RallypointExit_West : Flag_NATO_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; displayName = "Rallypoint West"; vehicleClass = QGVAR(Rallypoints); @@ -151,7 +151,7 @@ class CfgVehicles { }; class ACE_RallypointExit_East : Flag_CSAT_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; displayName = "Rallypoint East"; vehicleClass = QGVAR(Rallypoints); @@ -171,7 +171,7 @@ class CfgVehicles { }; class ACE_RallypointExit_Independent : Flag_AAF_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; displayName = "Rallypoint Independent"; vehicleClass = QGVAR(Rallypoints); diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp index 6f8ea1ceb20..18a83d60e96 100644 --- a/addons/respawn/config.cpp +++ b/addons/respawn/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { units[] = {}; weapons[] = { "ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent" }; requiredVersion = 0.60; - requiredAddons[] = { "ace_core" }; + requiredAddons[] = { "ace_common" }; version = QUOTE(VERSION); versionStr = QUOTE(VERSION); versionAr[] = { VERSION_AR }; diff --git a/addons/respawn/functions/fnc_handleKilled.sqf b/addons/respawn/functions/fnc_handleKilled.sqf index b64a5465fb4..e83a1f1dec1 100644 --- a/addons/respawn/functions/fnc_handleKilled.sqf +++ b/addons/respawn/functions/fnc_handleKilled.sqf @@ -29,5 +29,5 @@ if (GVAR(SavePreDeathGear)) then { }; if (missionNamespace getVariable [QGVAR(showFriendlyFireMessage), false]) then { - [_this, FUNC(showFriendlyFireMessage), 2] call EFUNC(Core,execRemoteFnc); + [_this, FUNC(showFriendlyFireMessage), 2] call EFUNC(common,execRemoteFnc); }; diff --git a/addons/respawn/functions/fnc_module.sqf b/addons/respawn/functions/fnc_module.sqf index 28cb68e8896..0a98eb24da7 100644 --- a/addons/respawn/functions/fnc_module.sqf +++ b/addons/respawn/functions/fnc_module.sqf @@ -27,8 +27,8 @@ if !(_activated) exitWith {}; GVAR(Module) = true; -[_logic, QGVAR(SavePreDeathGear), "SavePreDeathGear"] call EFUNC(Core,readBooleanParameterFromModule); -[_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(Core,readBooleanParameterFromModule); +[_logic, QGVAR(SavePreDeathGear), "SavePreDeathGear"] call EFUNC(common,readBooleanParameterFromModule); +[_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(common,readBooleanParameterFromModule); if (isServer) then { if (GVAR(RemoveDeadBodiesDisonncected)) then { diff --git a/addons/respawn/functions/fnc_moveRallypoint.sqf b/addons/respawn/functions/fnc_moveRallypoint.sqf index 788031fcf3c..dcd48108440 100644 --- a/addons/respawn/functions/fnc_moveRallypoint.sqf +++ b/addons/respawn/functions/fnc_moveRallypoint.sqf @@ -38,7 +38,7 @@ _this spawn { _position set [2, 0]; - [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core,displayTextStructured); + [localize "STR_ACE_Respawn_Deploy"] call EFUNC(common,displayTextStructured); sleep 5; _rallypoint setPosATL _position; @@ -50,5 +50,5 @@ _this spawn { _marker setMarkerTextLocal format ["%1:%2", [date select 3, 2, 0] call CBA_fnc_FORMATNumber, [date select 4, 2, 0] call CBA_fnc_FORMATNumber]; */ - [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core,displayTextStructured); + [localize "STR_ACE_Respawn_Deploy"] call EFUNC(common,displayTextStructured); }; diff --git a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf index 145792feffe..f384b692844 100644 --- a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf +++ b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf @@ -23,7 +23,7 @@ _unit = _this select 0; _killer = _this select 1; if (_unit != _killer && side group _unit in [side group ACE_player, civilian] && {side group _killer == side group ACE_player}) then { - systemChat format ["%1 was killed by %2", [_unit] call EFUNC(Core,getName), [_killer] call EFUNC(Core,getName)]; + systemChat format ["%1 was killed by %2", [_unit] call EFUNC(common,getName), [_killer] call EFUNC(common,getName)]; - [_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(Core,callCustomEventHandlers); + [_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(common,callCustomEventHandlers); }; diff --git a/addons/respawn/functions/fnc_teleportToRallypoint.sqf b/addons/respawn/functions/fnc_teleportToRallypoint.sqf index 0bb262239ae..8d898441ee0 100644 --- a/addons/respawn/functions/fnc_teleportToRallypoint.sqf +++ b/addons/respawn/functions/fnc_teleportToRallypoint.sqf @@ -44,4 +44,4 @@ _rallypoint = ([ if (isNull _rallypoint) exitWith {}; _unit setPosASL (getPosASL _rallypoint); -[[localize "STR_ACE_Respawn_TeleportedToRallypoint", localize "STR_ACE_Respawn_TeleportedToBase"] select _toBase] call EFUNC(Core, displayTextStructured); +[[localize "STR_ACE_Respawn_TeleportedToRallypoint", localize "STR_ACE_Respawn_TeleportedToBase"] select _toBase] call EFUNC(common,displayTextStructured); From b8d0f525448de6f2001e5a650dd67d125938b4f2 Mon Sep 17 00:00:00 2001 From: bux578 Date: Tue, 13 Jan 2015 20:10:30 +0100 Subject: [PATCH 14/15] probably fixing config --- addons/respawn/CfgVehicles.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index 55a18ad4787..0da25103b10 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -4,7 +4,7 @@ class CfgVehicles { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Respawn System"; - function = FUNC(module); + function = QFUNC(module); scope = 2; isGlobal = 1; icon = QUOTE(PATHTOF(UI\IconSwitchUnits_ca.paa)); @@ -34,10 +34,10 @@ class CfgVehicles { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Friendly Fire Messages"; - function = FUNC(moduleFriendlyFire); + function = QFUNC(moduleFriendlyFire); scope = 2; isGlobal = 1; - icon = PATHTOF(UI\Icon_Module_FriendlyFire_ca.paa); + icon = QUOTE(PATHTOF(UI\Icon_Module_FriendlyFire_ca.paa)); class Arguments { }; }; @@ -46,7 +46,7 @@ class CfgVehicles { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Rallypoint System"; - function = FUNC(moduleRallypoint); + function = QFUNC(moduleRallypoint); scope = 2; isGlobal = 1; icon = QUOTE(PATHTOF(UI\IconSwitchUnits_ca.paa)); From 7622f3daea83ea998a0b868bbd2b5610081bfb78 Mon Sep 17 00:00:00 2001 From: jaynus Date: Tue, 13 Jan 2015 17:32:27 -0800 Subject: [PATCH 15/15] Fixed and working. --- addons/respawn/CfgVehicles.hpp | 12 ++++++------ addons/respawn/config.cpp | 2 +- addons/respawn/functions/fnc_canMoveRallypoint.sqf | 2 +- addons/respawn/functions/fnc_module.sqf | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index 0da25103b10..7264a81aed1 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -82,7 +82,7 @@ class CfgVehicles { displayName = "Teleport to Rallypoint"; distance = 4; condition = QUOTE(side group _player == west); - statement = QUOTE([_player, side group _player, false] call FUNC(teleportToRallypoint);); + statement = QUOTE([_player, side group _player, false] call FUNC(teleportToRallypoint)); showDisabled = 1; priority = 1; }; @@ -102,7 +102,7 @@ class CfgVehicles { displayName = "Teleport to Rallypoint"; distance = 4; condition = QUOTE(side group _player == east); - statement = QUOTE([_player, side group _player, false] call FUNC(teleportToRallypoint);); + statement = QUOTE([_player, side group _player, false] call FUNC(teleportToRallypoint)); showDisabled = 1; priority = 1; }; @@ -122,7 +122,7 @@ class CfgVehicles { displayName = "Teleport to Rallypoint"; distance = 4; condition = QUOTE(side group _player == independent); - statement = QUOTE([_player, side group _player, false] call FUNC(teleportToRallypoint);); + statement = QUOTE([_player, side group _player, false] call FUNC(teleportToRallypoint)); showDisabled = 1; priority = 1; }; @@ -143,7 +143,7 @@ class CfgVehicles { displayName = "Teleport to Base"; distance = 4; condition = QUOTE(side group _player == west); - statement = QUOTE([_player, side group _player, true] call FUNC(teleportToRallypoint);); + statement = QUOTE([_player, side group _player, true] call FUNC(teleportToRallypoint)); showDisabled = 1; priority = 1; }; @@ -163,7 +163,7 @@ class CfgVehicles { displayName = "Teleport to Base"; distance = 4; condition = QUOTE(side group _player == east); - statement = QUOTE([_player, side group _player, true] call FUNC(teleportToRallypoint);); + statement = QUOTE([_player, side group _player, true] call FUNC(teleportToRallypoint)); showDisabled = 1; priority = 1; }; @@ -183,7 +183,7 @@ class CfgVehicles { displayName = "Teleport to Base"; distance = 4; condition = QUOTE(side group _player == independent); - statement = QUOTE([_player, side group _player, true] call FUNC(teleportToRallypoint);); + statement = QUOTE([_player, side group _player, true] call FUNC(teleportToRallypoint)); showDisabled = 1; priority = 1; }; diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp index 18a83d60e96..2391af350ff 100644 --- a/addons/respawn/config.cpp +++ b/addons/respawn/config.cpp @@ -21,5 +21,5 @@ class CfgPatches { class ACE_Parameters_Boolean { GVAR(SavePreDeathGear) = 0; - GVAR(RemoveDeadBodiesDisonncected) = 1; + GVAR(RemoveDeadBodiesDisconnected) = 1; }; diff --git a/addons/respawn/functions/fnc_canMoveRallypoint.sqf b/addons/respawn/functions/fnc_canMoveRallypoint.sqf index e6f91a256f6..d5f325c067b 100644 --- a/addons/respawn/functions/fnc_canMoveRallypoint.sqf +++ b/addons/respawn/functions/fnc_canMoveRallypoint.sqf @@ -24,7 +24,7 @@ _side = _this select 1; // rallypoint names are defined in CfgVehicles.hpp -_unit getVariable ["ACE_canMoveRallypoint"), false] +_unit getVariable ["ACE_canMoveRallypoint", false] && {!isNull ([ objNull, missionNamespace getVariable ["ACE_Rallypoint_West", objNull], diff --git a/addons/respawn/functions/fnc_module.sqf b/addons/respawn/functions/fnc_module.sqf index 0a98eb24da7..0a996d0acc8 100644 --- a/addons/respawn/functions/fnc_module.sqf +++ b/addons/respawn/functions/fnc_module.sqf @@ -28,10 +28,10 @@ if !(_activated) exitWith {}; GVAR(Module) = true; [_logic, QGVAR(SavePreDeathGear), "SavePreDeathGear"] call EFUNC(common,readBooleanParameterFromModule); -[_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(common,readBooleanParameterFromModule); +[_logic, QGVAR(RemoveDeadBodiesDisconnected), "RemoveDeadBodiesDisconnected"] call EFUNC(common,readBooleanParameterFromModule); if (isServer) then { - if (GVAR(RemoveDeadBodiesDisonncected)) then { + if (GVAR(RemoveDeadBodiesDisconnected)) then { _fnc_deleteDisconnected = { _this spawn { _unit = _this select 0;