From 5fb097ff8dd3476423f5df5ef6345ed14267e874 Mon Sep 17 00:00:00 2001 From: "Brandon-PC\\Brandon" Date: Tue, 15 Jan 2019 17:12:34 -0700 Subject: [PATCH] hpp newline fixes. Case sensitivity for model and rvmat references --- addons/dragon/$PBOPREFIX$ | 3 +-- addons/dragon/ACE_GuidanceConfig.hpp | 3 +-- addons/dragon/CfgAmmo.hpp | 3 +-- addons/dragon/CfgEventHandlers.hpp | 3 +-- addons/dragon/CfgMagazines.hpp | 3 +-- addons/dragon/CfgVehicles.hpp | 18 +++++++++++++++--- addons/dragon/CfgWeapons.hpp | 3 +-- addons/dragon/XEH_PREP.hpp | 3 +-- addons/dragon/data/M47.rvmat | 10 +++++----- addons/dragon/data/M47mis.rvmat | 10 +++++----- addons/dragon/functions/script_component.hpp | 3 +-- addons/dragon/models/M47.p3d | Bin 1725129 -> 1725129 bytes addons/dragon/models/M47_loaded.p3d | Bin 2042017 -> 2037184 bytes addons/dragon/models/ace_m47_magazine.p3d | Bin 1837378 -> 1837378 bytes addons/dragon/models/ace_m47_optic.p3d | Bin 969482 -> 969482 bytes addons/dragon/models/ace_m47_static.p3d | Bin 2575438 -> 2575438 bytes addons/dragon/models/model.cfg | 3 +-- addons/dragon/models/optics_m47.p3d | Bin 3297 -> 3297 bytes addons/dragon/script_component.hpp | 3 +-- 19 files changed, 35 insertions(+), 33 deletions(-) diff --git a/addons/dragon/$PBOPREFIX$ b/addons/dragon/$PBOPREFIX$ index e57469074e..41f191d39b 100644 --- a/addons/dragon/$PBOPREFIX$ +++ b/addons/dragon/$PBOPREFIX$ @@ -1,2 +1 @@ -z\ace\addons\dragon - +z\ace\addons\dragon \ No newline at end of file diff --git a/addons/dragon/ACE_GuidanceConfig.hpp b/addons/dragon/ACE_GuidanceConfig.hpp index 18cc5dd9fe..c90bcefa6c 100644 --- a/addons/dragon/ACE_GuidanceConfig.hpp +++ b/addons/dragon/ACE_GuidanceConfig.hpp @@ -7,5 +7,4 @@ class EGVAR(missileguidance,AttackProfiles) { onFired = QFUNC(onFired); functionName = QFUNC(attackProfile_DRAGON); }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgAmmo.hpp b/addons/dragon/CfgAmmo.hpp index faccdfb1cd..9761ae0fd3 100644 --- a/addons/dragon/CfgAmmo.hpp +++ b/addons/dragon/CfgAmmo.hpp @@ -143,5 +143,4 @@ class CfgAmmo { soundHit[] = {QPATHTOF(sounds\service_charge.wss),56.23413,1,1800}; multiSoundHit[] = {"soundDefault1", 1}; }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgEventHandlers.hpp b/addons/dragon/CfgEventHandlers.hpp index 755e0552c5..da6dde25ca 100644 --- a/addons/dragon/CfgEventHandlers.hpp +++ b/addons/dragon/CfgEventHandlers.hpp @@ -8,5 +8,4 @@ class Extended_PreInit_EventHandlers { class ADDON { init = QUOTE(call COMPILE_FILE(XEH_preInit)); }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgMagazines.hpp b/addons/dragon/CfgMagazines.hpp index e4b59a9304..6fa4d9569e 100644 --- a/addons/dragon/CfgMagazines.hpp +++ b/addons/dragon/CfgMagazines.hpp @@ -12,5 +12,4 @@ class CfgMagazines { displayNameShort = CSTRING(dragonName); descriptionShort = CSTRING(dragonDescription); }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgVehicles.hpp b/addons/dragon/CfgVehicles.hpp index 9254dcbae4..98c5888031 100644 --- a/addons/dragon/CfgVehicles.hpp +++ b/addons/dragon/CfgVehicles.hpp @@ -36,7 +36,20 @@ class CfgVehicles { cost = 150000; class Damage { tex[] = {}; - mat[] = {"a3\static_f_gamma\data\staticturret_01.rvmat","a3\static_f_gamma\data\staticturret_01_damage.rvmat","a3\static_f_gamma\data\staticturret_01_destruct.rvmat","a3\static_f_gamma\data\staticturret_02.rvmat","a3\static_f_gamma\data\staticturret_02_damage.rvmat","a3\static_f_gamma\data\staticturret_02_destruct.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_launcher.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_launcher_damage.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_launcher_destruct.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_mtube.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_mtube_damage.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_mtube_destruct.rvmat"}; + mat[] = { + "a3\static_f_gamma\data\staticturret_01.rvmat", + "a3\static_f_gamma\data\staticturret_01_damage.rvmat", + "a3\static_f_gamma\data\staticturret_01_destruct.rvmat", + "a3\static_f_gamma\data\staticturret_02.rvmat", + "a3\static_f_gamma\data\staticturret_02_damage.rvmat", + "a3\static_f_gamma\data\staticturret_02_destruct.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_launcher.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_launcher_damage.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_launcher_destruct.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_mtube.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_mtube_damage.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_mtube_destruct.rvmat" + }; }; class Turrets: Turrets { class MainTurret: MainTurret { @@ -191,5 +204,4 @@ class CfgVehicles { }; }; }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgWeapons.hpp b/addons/dragon/CfgWeapons.hpp index 2bbb06e592..2fe168e41a 100644 --- a/addons/dragon/CfgWeapons.hpp +++ b/addons/dragon/CfgWeapons.hpp @@ -76,5 +76,4 @@ class CfgWeapons { mass = 68; }; }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/XEH_PREP.hpp b/addons/dragon/XEH_PREP.hpp index 776be6c72d..f2965ba0bc 100644 --- a/addons/dragon/XEH_PREP.hpp +++ b/addons/dragon/XEH_PREP.hpp @@ -2,5 +2,4 @@ PREP(attackProfile_DRAGON); PREP(canPickupTripod); PREP(onFired); PREP(onDisassemble); -PREP(canDeployWeapon); - +PREP(canDeployWeapon); \ No newline at end of file diff --git a/addons/dragon/data/M47.rvmat b/addons/dragon/data/M47.rvmat index 451559fa79..3241cd20d7 100644 --- a/addons/dragon/data/M47.rvmat +++ b/addons/dragon/data/M47.rvmat @@ -1,5 +1,5 @@ class StageTI { - texture="z\ace\addons\dragon\data\M47_TI_CA.paa"; + texture="z\ace\addons\dragon\data\m47_ti_ca.paa"; }; ambient[]={0.958,0.984,1,1}; diffuse[]={0.958,0.984,1,1}; @@ -10,7 +10,7 @@ specularPower=90; PixelShaderID="Super"; VertexShaderID="Super"; class Stage1 { - texture="z\ace\addons\dragon\data\M47_nohq.paa"; + texture="z\ace\addons\dragon\data\m47_nohq.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -20,7 +20,7 @@ class Stage1 { }; }; class Stage2 { - texture="a3\weapons_f\data\detailmaps\Metal_rough_DT.tga"; + texture="a3\weapons_f\Data\DetailMaps\Metal_rough_DT.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -50,7 +50,7 @@ class Stage4 { }; }; class Stage5 { - texture="z\ace\addons\dragon\data\M47_smdi.paa"; + texture="z\ace\addons\dragon\data\m47_smdi.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -70,7 +70,7 @@ class Stage6 { }; }; class Stage7 { - texture="a3\data_f\env_land_co.tga"; + texture="a3\data_f\env_land_co.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; diff --git a/addons/dragon/data/M47mis.rvmat b/addons/dragon/data/M47mis.rvmat index 24468d29f3..b530ec030b 100644 --- a/addons/dragon/data/M47mis.rvmat +++ b/addons/dragon/data/M47mis.rvmat @@ -1,5 +1,5 @@ class StageTI { - texture="z\ace\addons\dragon\data\M47_TI_CA.paa"; + texture="z\ace\addons\dragon\data\m47_ti_ca.paa"; }; ambient[]={0.989,1,0.958,1}; diffuse[]={0.989,1,0.958,1}; @@ -10,7 +10,7 @@ specularPower=90; PixelShaderID="Super"; VertexShaderID="Super"; class Stage1 { - texture="z\ace\addons\dragon\data\M47mis_nohq.paa"; + texture="z\ace\addons\dragon\data\m47mis_nohq.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -20,7 +20,7 @@ class Stage1 { }; }; class Stage2 { - texture="a3\weapons_f\data\detailmaps\Metal_rough_DT.tga"; + texture="a3\weapons_f\Data\DetailMaps\Metal_rough_DT.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -50,7 +50,7 @@ class Stage4 { }; }; class Stage5 { - texture="z\ace\addons\dragon\data\M47mis_smdi.paa"; + texture="z\ace\addons\dragon\data\m47mis_smdi.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -70,7 +70,7 @@ class Stage6 { }; }; class Stage7 { - texture="a3\data_f\env_land_co.tga"; + texture="a3\data_f\env_land_co.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; diff --git a/addons/dragon/functions/script_component.hpp b/addons/dragon/functions/script_component.hpp index 51b93e3d9d..386679ecf6 100644 --- a/addons/dragon/functions/script_component.hpp +++ b/addons/dragon/functions/script_component.hpp @@ -1,2 +1 @@ -#include "\z\ace\addons\dragon\script_component.hpp" - +#include "\z\ace\addons\dragon\script_component.hpp" \ No newline at end of file diff --git a/addons/dragon/models/M47.p3d b/addons/dragon/models/M47.p3d index 982e85a6ad3e17dc99b96997badf968e5fef2c9c..9554efe7f830face71d336437426c9b3052d573d 100644 GIT binary patch delta 1858 zcmYk4Ye-Z<6vx?Gy{YZ)Sf;tFnUI8~W~G@~W+sFrC5Z?jkwnBsn4$TIO2Q9o5k=h( z6Om|yAbsi0Eki<*P^8Q+A^Cn=`EE(K5IT3}o|*gMz;FKNf6mM~_jWY8I~v{3Zw^_q z)O+I_)cT<+gA#_3S_I{cpw=ts{3vQZLA7J3g^hE%V{}cPz)YKa5rwCN{m^+QB$`H4jd!$i&bg{Kxc^@`KUX{^Z^A*yd0U6nJapC2V^*sQMK zn8hd8juAC^4!y7ExHm@4n@6o}f~X_nRJ4HI<^@$RqGtb%R3|9TTNRX5R8~}Yv82p> zrc@1Han*EsJ)K?)#43o@5LO63t<&pY8^ZTP-2sZxi!Mv_1nR102~wUo3}drX7_(gh zdjx9dB9!82OBU^JAfa^nfKtf|wJYh0t;uLoHz6wHCK0vwlS(8p9J5O((`(B*Qg}p+ z7U5H7pt=5gd7@lvAOau)A%Y;*YEdrR;7g;0=Z}NXEnjS~S!!8w#L!oa^;+7v1i8#E zJ;%VPT z_Ii|QL4%GSSPDci#5#!e5Frp7AVML+AU0~<4dF?(mRxGt?~JBfW1Yv5A8;Oy2R&dL z(-~he@h=k>ZkL|VCQgr&`ZE)6j+gp9!6k4#yQVZjron2ZQwh$an9ScHlb=kSlE`#6 zOA}|-EPSW*-{QF*;CH$ zk@`2zOh1w$+r8z?YGe0G|3ec8rAqy(iDyiFYM=CUnK&a&>cCd|CXMYDE)@G$_e+oU zfaJ?2o-lDiI`gnu+BviLryi8GPX))&s0_R^n%>Tko)r@pACmf@iE}fh-pV=nuw4C< P!z>L?iPT7z^PT-aNpHT# delta 1858 zcmYk4X-HI26vvqweN8qq*A}fA%Y-B>o3=5t#Y}^cq$Cj`B9e@l2s1RbXd(JAQ$$hk z!;L63M3BC;^IDLQBorx|FA-U;(@cwN4e1m@=iU3xz3;<;-~FHeIrpCPUT3qfv)T9H zQop4_z5aE9+R%T>AkP3&tDvGm)OrLR9YQT8C=fy|`75WZM%Sz`X4(anL{J-_AnLD( z&+wl3X6QG*qv4vMB|lJW=qGCH4=nNw5Vhzho?7A5BToBo9>3V+oZ2nN4Lkrb8Q_l1G&;g_2 zDBdZ7uO;q{2^9t;bRy<7)}U4Wb&Ao(W)kdk&MFY5L=~n2nT z&}}Q2&iJ&6f0}szO6hrP;@nKB-#78nRZ_n$xC*Xk*Hn9C8mw0O&EwjI$?wygNc{t6rti#_?VfRFwHX_w|CWgpa-@F7#3Lp?ut|ElO`Nw`>cCd|bTiv6TqyRh zZjm1AR>>z#95!)TF7vQiIykfU=WLU;_XMZY)I7X0jb6!cYa-AK_FiSxy=pie0VFMr9RU`_6e(+%-E07>@D*m649fhce3jNfWN}ztg zOZ6~}d#!EF7Nk)UvR>+(39$lXG|ty-{8HG`YjfcU{0$3N>Doj!cDWz1x){&Y7)eBh z6wvCm$JVNn=1>fjQQ->J?~Sr9`KmF2RE=#t)Q&|OnHe#yc@@^R+_iBG&Gac7$Iz&g zmkIGYi`QDky`OBnV-MFco&xG#(Y$7wQHG(SV0Fi!tm7!>wvH?(q>Bdio@`)Vve6(-zQF?CUj!yp zAA9D;kdLM(3n5=zp{t!cSpf!Y9FL=reHFg1*e7qKd%UT=z2*+3X zs`oaI@mUuPYI2&94FHYDE_ryJEg}a$YWxpWc7@q)#Nv6}4G}>^5!(N(Vq8ez zLO-=A#55>KL-V>wa$IPO%p^C_BBgfW!Zgdj>U(#*_rAq}^Uim^``vTzyVEaP2NqlJ z-m{Eb&)O`t(C)B$;EK(9i}BV}Nr5e!HN*s$AB7IP5Q=(L3339G8@vvtK49+Z8BK!n zG%TKyS@x|x02ejEmreY-N9cc}{ME4PgRVsD&HZ&qiq~2W_%TqB z;Dh#;ya4VI(fm;GaQ3K`WRJ$2ZeTmX-24nMGUxp!&XTjSFc}a=mK=*Dk|wqBj8)mf z^xedpj|m+!Dxe;h_^D%11qPx5O`Dk`@v$R0v=hT7lEPf+vyq%$WbQ02MCv>~h|Kba zaK)TND&`I*O~qzh((Co$4ZSwwz@kbbowgDSSuXe2$)p-=M;*?FP;+yrUN?#Z+x994 z35*>&VFyMn)oaVcbM zS8j`An=W%Z4QIsdqldKitK#A84DteW&SO{qQ_+R5 zM}pKLv2OAQbW9Ej$8$p{8>RyOUhLpW)iag7Bc?%VVFEi(SQ0!OEJ`53A}!?(I|$6p zjTo8pF%!q+3RFfkeprhUVZ``G6JDr~tj}mVe?pD#g=x>kF*%=t89B#z2FGMsaBe{i zd$&M!`fx6P)WpLntMkywbsiQwtcN^^M1&WSgzzB_Ba#s*h*YA7{DBTj6Rhm{(_whc zf1YvgPs$fJQSUJEEfc@CE<9gMykbM>QzoAKOXyEH&jM}JUygI>toBXjX<}0FH1uafoql Mly^~1aQ&~||0U2)O8@`> diff --git a/addons/dragon/models/ace_m47_magazine.p3d b/addons/dragon/models/ace_m47_magazine.p3d index c9f08cd918332dc315b30ddfd1492ae8d5c4ed6b..39a8b6d80aae3c13417f12ced8a38433dd7459b9 100644 GIT binary patch delta 701 zcmYk3J4gdT5Qgy)H8E;@BtDi!uCTEQ>Fm;K6+sX!1+f!iC)gFzoM&L&PqX=RQ zvT7W8wnft}=XJdhNuPB# zHcfq*LCSVlywcDt>AInPNs*>zgFafS@nuuQ^`hEM9WrRY#jHfPapITx$-}X>bAHm+ vFEL1|AzJFHa%icN?(nYB;V#Y?L3*=Q49|i8KEnr|=)6 delta 701 zcmYk3J4gdT5Qd2wH8E;@BtDi!uCTEQ>Fm;Kl|m3L1+f#(POwq_jWU$|5o5eMwAm?p@rQG{eX8{j;;P*_4@0naA*90D~BUAHx{IC;|v#3?YnT z0+R@13e%XuEFy?v4)a*RVp=@pd?xJ_grxVJ*wDP5*KE*ZULrteRw7SE!}&q?)$G<2v!sBbtZQj1_mbL3};L>O;d;ykl$LM`2p77gfm; z--@=TNmkm?;N~edNRCiU?SZ&BLNPsR#O)oS>we@k>z6!S9wYzV!?S0|&+SA1=CkY% z^UfN4XJuks)i<*^uH3-Epd0~mIbd`R=Q#M!G!tJ>~uN{HhG?NjO%+Ip-XJ~ z#KW0M@-VMuY0`AT1|liP?D#QeA*^eeEmQniHX>Z?kXskj4LAx5K})rDO5rrrTBkOw zezC9fE+1&g^#{(=+y0=wl-ytt$;BM`&pE>zhnJ5M|MKwdW8_-~h@W}*aGpGd|DEOb zy*x-6W3*I`^A73+#rp!bVz4qL&p{ ads(si2isgD(+!W>s+o98Efa73bmceFu78*S delta 1262 zcmah|&r4KM7-i<#Ysy#M76yvYKt9XNajc|32&Wor(n+(-#y1&68y8WFf^;P`Fk}$@ z06!=wTt%B8D5gb=c5U(xh$4t`W2=@yU}tXKdu}1PxNtboaHEQEC}Gi8cD%SMEYZF1|px&cRFA!w<#PAZ&+TI=Mx zl`r;n-sJ-=x&FX;dfOk=my#O@BDs(w|2b!P4A#uzP?W4wbpPVv6MRXD?0kCVdLfU~g{78*xBSc7XP{O%6M010=Ic+#HvpWaD~TswZ1NWbc!j7VqY+U~HPLbGW+ZdOz$iHn`A{^4PS+YR|I*N*SX zu;z`2VRZFeyHFs~u8T=?s)zePn$z;MCoJL8iM{++*GjXNulvkL#_8yOj(*cxjK=#lgE6;8DGOVrC}oxwLVbl4+4z)XZDFS* zDGOyMY%Ih=%|aGzER=;4bI&=x#n=4$o&R@k|1&px2eunND`0~pNCrEkKq{m`I%Gg5 zWI;CMKrZ9~gM27}LMQ?U6oV5=pcKlW94f#C?h|bzU<=|-kLJL`fVOC{w?p!U!e*!R zj|$IqN<rdbjk>9*eiE&-i;S<-jY2Kf)Tr={{}N3cmEoV60#8?tnntR@gl#{jtKl zB13aX-phM3d{o3#P;R~|%*!%d56Mm5lA&|>SF8?eq7rY(&_5!BCnNI4p;5{A3iIv^ zV_~_(A3*#U%VUChUxx08%pF9;88(=L*Un9iPbD9nPZghPJ~e!5PtVP|;FE0}V;)0C z-D5=mc;WBIg$wnD9Yb$*A-we(nTnlI*pBgfYcsJj*+9fK6@f;QIHID=OA?z@d{Z&s zL{^@uh&GeNB^5s3Z(`MF{C|b`J9&kb79;TrI)1j0YiC-Cco0Iz(Kd2;CWMY2KRMi| PBD>v6=%-8V#+~B_fMY&p delta 1023 zcmZ9JODIH97{?pNYrKxf7|*$`*R3&z!DzgnV}`jk3uR$Tic&L63!%P3ifnvJvbL~O zl9YwA6E+rNp)6#<#zI**;huARi?8|hJOA(8{%5Xs_H0*tmcRx{kPLQ6fmBF?bjSb) zWI`5XLk{EugFMKG0w@G06oCthp#(~y49cMb+(+74&^Coz-I^2kgW9~szIMrH3Y#6$ z-zz-ZDgCFyt6kE&x-H(YJ`?D%loKx$ejm{oPWEauR`97;1`~aPxBCU+ro!$4=?@j= z6&ad?@?PGP;k_azhUDgp!n`cQ)sWoeEg8Cof5h^zCMxlk3