From 126be1a5409af8054277daa056918c41aafc575d Mon Sep 17 00:00:00 2001 From: commy2 Date: Sun, 14 Apr 2019 09:29:55 +0200 Subject: [PATCH 1/2] rename 2doptics to optics --- addons/2doptics/$PBOPREFIX$ | 1 - addons/2doptics/cba_optic_big_pip.p3d | Bin 18066 -> 0 bytes addons/2doptics/cba_optic_small_pip.p3d | Bin 18066 -> 0 bytes addons/2doptics/stringtable.xml | 21 ------------------ addons/optics/$PBOPREFIX$ | 1 + .../CfgCarryHandleTypes.hpp | 0 .../{2doptics => optics}/CfgEventHandlers.hpp | 0 .../{2doptics => optics}/CfgOpticsEffect.hpp | 0 addons/{2doptics => optics}/CfgPIPItems.hpp | 0 addons/{2doptics => optics}/RscInGameUI.hpp | 0 addons/{2doptics => optics}/XEH_PREP.sqf | 0 addons/{2doptics => optics}/XEH_preInit.sqf | 0 addons/{2doptics => optics}/XEH_preStart.sqf | 0 .../cba_optic_big_100.p3d | Bin 3476 -> 3468 bytes .../{2doptics => optics}/cba_optic_big_70.p3d | Bin 3475 -> 3467 bytes .../{2doptics => optics}/cba_optic_big_80.p3d | Bin 3475 -> 3467 bytes .../{2doptics => optics}/cba_optic_big_90.p3d | Bin 3475 -> 3467 bytes addons/optics/cba_optic_big_pip.p3d | Bin 0 -> 17778 bytes .../cba_optic_small_100.p3d | Bin 3431 -> 3423 bytes .../cba_optic_small_70.p3d | Bin 3430 -> 3422 bytes .../cba_optic_small_80.p3d | Bin 3430 -> 3422 bytes .../cba_optic_small_90.p3d | Bin 3430 -> 3422 bytes addons/optics/cba_optic_small_pip.p3d | Bin 0 -> 17778 bytes addons/{2doptics => optics}/config.cpp | 0 .../fnc_animateScriptedOptic.sqf | 4 ++-- .../fnc_animateScriptedOpticRecoil.sqf | 4 ++-- .../fnc_changeCarryHandleOpticClass.sqf | 4 ++-- .../fnc_changePIPOpticClass.sqf | 6 ++--- .../{2doptics => optics}/fnc_currentOptic.sqf | 4 ++-- .../fnc_initDisplayInterrupt.sqf | 0 .../fnc_loadScriptedOptic.sqf | 4 ++-- .../fnc_restartCamera.sqf | 6 ++--- .../fnc_setOpticMagnification.sqf | 4 ++-- .../fnc_setOpticMagnificationHelper.sqf | 4 ++-- ...fnc_setOpticMagnificationHelperZeroing.sqf | 4 ++-- .../fnc_updateOpticInfo.sqf | 4 ++-- addons/{2doptics => optics}/initSettings.sqf | 0 .../{2doptics => optics}/reticles/pip.rvmat | 0 .../reticles/scopeblack.rvmat | 0 .../reticles/scopeblack_big_100_ca.paa | Bin .../reticles/scopeblack_big_70_ca.paa | Bin .../reticles/scopeblack_big_80_ca.paa | Bin .../reticles/scopeblack_big_90_ca.paa | Bin .../reticles/scopeblack_ca.paa | Bin .../reticles/scopeblack_small_100_ca.paa | Bin .../reticles/scopeblack_small_70_ca.paa | Bin .../reticles/scopeblack_small_80_ca.paa | Bin .../reticles/scopeblack_small_90_ca.paa | Bin .../{2doptics => optics}/script_component.hpp | 10 ++++----- addons/optics/stringtable.xml | 21 ++++++++++++++++++ 50 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 addons/2doptics/$PBOPREFIX$ delete mode 100644 addons/2doptics/cba_optic_big_pip.p3d delete mode 100644 addons/2doptics/cba_optic_small_pip.p3d delete mode 100644 addons/2doptics/stringtable.xml create mode 100644 addons/optics/$PBOPREFIX$ rename addons/{2doptics => optics}/CfgCarryHandleTypes.hpp (100%) rename addons/{2doptics => optics}/CfgEventHandlers.hpp (100%) rename addons/{2doptics => optics}/CfgOpticsEffect.hpp (100%) rename addons/{2doptics => optics}/CfgPIPItems.hpp (100%) rename addons/{2doptics => optics}/RscInGameUI.hpp (100%) rename addons/{2doptics => optics}/XEH_PREP.sqf (100%) rename addons/{2doptics => optics}/XEH_preInit.sqf (100%) rename addons/{2doptics => optics}/XEH_preStart.sqf (100%) rename addons/{2doptics => optics}/cba_optic_big_100.p3d (82%) rename addons/{2doptics => optics}/cba_optic_big_70.p3d (82%) rename addons/{2doptics => optics}/cba_optic_big_80.p3d (82%) rename addons/{2doptics => optics}/cba_optic_big_90.p3d (82%) create mode 100644 addons/optics/cba_optic_big_pip.p3d rename addons/{2doptics => optics}/cba_optic_small_100.p3d (82%) rename addons/{2doptics => optics}/cba_optic_small_70.p3d (82%) rename addons/{2doptics => optics}/cba_optic_small_80.p3d (82%) rename addons/{2doptics => optics}/cba_optic_small_90.p3d (82%) create mode 100644 addons/optics/cba_optic_small_pip.p3d rename addons/{2doptics => optics}/config.cpp (100%) rename addons/{2doptics => optics}/fnc_animateScriptedOptic.sqf (97%) rename addons/{2doptics => optics}/fnc_animateScriptedOpticRecoil.sqf (96%) rename addons/{2doptics => optics}/fnc_changeCarryHandleOpticClass.sqf (95%) rename addons/{2doptics => optics}/fnc_changePIPOpticClass.sqf (97%) rename addons/{2doptics => optics}/fnc_currentOptic.sqf (94%) rename addons/{2doptics => optics}/fnc_initDisplayInterrupt.sqf (100%) rename addons/{2doptics => optics}/fnc_loadScriptedOptic.sqf (94%) rename addons/{2doptics => optics}/fnc_restartCamera.sqf (87%) rename addons/{2doptics => optics}/fnc_setOpticMagnification.sqf (91%) rename addons/{2doptics => optics}/fnc_setOpticMagnificationHelper.sqf (78%) rename addons/{2doptics => optics}/fnc_setOpticMagnificationHelperZeroing.sqf (75%) rename addons/{2doptics => optics}/fnc_updateOpticInfo.sqf (96%) rename addons/{2doptics => optics}/initSettings.sqf (100%) rename addons/{2doptics => optics}/reticles/pip.rvmat (100%) rename addons/{2doptics => optics}/reticles/scopeblack.rvmat (100%) rename addons/{2doptics => optics}/reticles/scopeblack_big_100_ca.paa (100%) rename addons/{2doptics => optics}/reticles/scopeblack_big_70_ca.paa (100%) rename addons/{2doptics => optics}/reticles/scopeblack_big_80_ca.paa (100%) rename addons/{2doptics => optics}/reticles/scopeblack_big_90_ca.paa (100%) rename addons/{2doptics => optics}/reticles/scopeblack_ca.paa (100%) rename addons/{2doptics => optics}/reticles/scopeblack_small_100_ca.paa (100%) rename addons/{2doptics => optics}/reticles/scopeblack_small_70_ca.paa (100%) rename addons/{2doptics => optics}/reticles/scopeblack_small_80_ca.paa (100%) rename addons/{2doptics => optics}/reticles/scopeblack_small_90_ca.paa (100%) rename addons/{2doptics => optics}/script_component.hpp (90%) create mode 100644 addons/optics/stringtable.xml diff --git a/addons/2doptics/$PBOPREFIX$ b/addons/2doptics/$PBOPREFIX$ deleted file mode 100644 index 81feffa7b..000000000 --- a/addons/2doptics/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -x\cba\addons\2doptics diff --git a/addons/2doptics/cba_optic_big_pip.p3d b/addons/2doptics/cba_optic_big_pip.p3d deleted file mode 100644 index c03f9a4597ba966f7d3f674bfe3b237993809db2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18066 zcmeI4dt6mj7RT>}%m;x_v{Xa^QxFW51nx!7xu*ES$M~R0F+(6F5D3t;CQ)mYETeI> z(tKnO^ED~W%qO|`=Dk=J_^Q;8rTHqKX-YLdY8rKZ>&m*E*2zESGo883=i~l-*5|IZ z*V<=)&${QHv-dt5hNcehXEvKmekPM?M6Z5B+vC#&I~5-T>x8PhMW))qx_{(caU?LA z?BT(wwt2zx)WQQd?CVE|*w+3r(8l)pNSAu4rrthbGOIt;*4qcKncP}?dbG=}jX%32 zwQ7y#cyBpUtI9O}B~+(YP3l_DL;kN`D|0g+wI6-1Nfq0rIKE$8fY&~Y{->tb+n<1M zn#Mj3er-IR-zd%T=={Ia^!G~Q88vB1u5-!QD}5+G4<{T{51kKD+3t0+LQVR3k=IVO zOjaLXUG24>9llDrY(3$%8xLOPx~Q?|#!q%@<3B!L;np6{KmMTmh^9YF!Wnny!g?O^ zH`o^HW}ba$zstVZYnS8rfeUNA_Fd@znJy>2b`kiV)z}L7gEjHpaekj`j+cq^Z?EaE zQ$(t5#242T{yuKMI>ff>-b3E&=cM9it6f`veb@tMsiCws(vKkxNI@lD-_z4kmD?|k$6>%)QmnhmYDr(P>c zcsZlqegnK({|TJWH=6czzHKzer+nmS`d_sEgu1P8rNZCO`PMb+_>@U1+ex;?YDP|l z*KV=DgF3-+z-z}J-x|d-1MiO-e>~3Ts;2$dINzn3 z<1a)$;xzsDekP*to?Vx1^xL8Wdn@d!863tC9a3wXVEC@#-cTw))IifxS_RHEA$l^do1pe{z;!) zEp@%xtG#8n<<6w8(08qwW%<)*5lL(QRqA@kv1?QEpl(UI&<}K6P|YRW) zU&$J8KU-^do`s$`_67TxvkA`XpGsX%RL9uc_l|VVMEveEejxbwplM`@7J;YBb22cBOA6 zeMh6`46`nYUsXxJBY*r5BkF#PQ(KwTm;FBXj1$bL`%6oc`dJr~(i=LBGfsDEp>}k9 zW}?C>zmv*~RIFIfdPercKExF%e@62z|~y*IdmB`ei09vlmRG z7|lri-v-&*+N2K1S)VNP+7iA7kPoU_s6n*{e3D1WAQ^uP-*r54bUS3;3<{{YC&W3AQc%hn}JCdrIY zT`@Y3l1Vbt{rwI|`uEM$kx9PEV=(#;gj9cVr;2fPvSgCX2-Ov%^C+1la~BW=L5`je zR;QbNlgC8#-xSg%u$@|Mc_~>kNoIuViqUzLOp=+N<;@_YYuc(Qhuiz){@5D*H-~i1 z3{fX{UzjYJBr`&F#pparCdu3tL^OU2+8L@QeCnG#TF^g@8=8P&Md=I4l1VZnR9B47 zBaIE|K3%gr!gIYz#y0TL@8&{WnCDu6sw+k_$~;OY$*coJh0%;Mk5=?a-|vO_5$bl_ ziz1;Dcb|2UKD$54yh%oR4#3qFqw^^9bSDT%hB@!{JR50@eix+S>h3;!Udy~mMtKgv z)fJ=jDD#vAg0_&s?{@W!)uN!cgKTXar%v?I_)+FfGRkuRuC5rJN4nPNJx9TmD9`*w z=1nr|08wEyqhylIG)D}9GBi|(_qI zx?=S8DDyREmI|$zMMCI)S-CXoH<3rlD9-`7x?*%5Wu8 zNgh@7ug#lel;?nOT`@Y3HuOjwG=EvRJ4(3+Itk5RVm?h%Br{yPVl<=tE+vy>)&Ziz zXhs@?$3liltK0#-2ZZL+kDp3YWS-&D6{8tto+OiG)&ZizXvV(iqbH;m>pQun zaSG+M7lhV#!Y-#NGS6`7iqVWRPm)P8>i|(i|(!CHr8oVpc#q+x<^gfXB zcz;dLZ>YLrG^1pa%reh9KvWpbDD%`GebT(2_AV^Oc#@volswu`LE}lNx?(h=WRlD> z&pJR<7|kg2L~Cd&g!cD1F`sD$oyKdlzvm7g&1YmDC8InC;OdIed6apQj5H?d3!%MT zP9M#$Q_w#>?`TilX3Y5|lVnDyt{9z1$t0PZgNW`wv_I16qxBwISEg%{_F$%B4N5Xe zW`ydB(Rq|il9|Tj#7X;gAM(-q;{fzeLVJR3SQC{@k{O}8VssuQlVm0!Glcg!>i|(< zG-C_&;Sb?`&BUN(`Xy$H(H0{aN81JrFo%ztoKaNRKWkEUak!}?x*iA_T=zKypM&ab z`Xt+Y-;BH*+U^}2+rzYoDt@JcL;Y&UGKY^SDk#L3^cmr%SvYQ9K~{c2@#KuGg2$+v z|G3al|Gz2b@G)tlvP;5EAKZT9FuWh1uTS28&({ju?B{*w+>ZB|^C#DHJKkT-?KqC> zc`q~j+2;Mjyl}Q+(ymx{35AePL>1Uh${GOcOkIVLKv!CAw^Lt>~o^AH?C%5DGocykl zZRzLtdi*|*ZI0*m?C1Aa{N9S=xt`YARt9cm;8q51W#IoY z1LpAl`B}psPRYs3ruB^*Mf=}Z>LzaNGTq;)k-JIMo34odPFmnLZQ9t*eZIkRB_g`a zV_yr~ueg6)rZj%3-0T0W*9zsU1lM~M|C)beckjYCUE%$mTgZ;ua6oB1ai#Lz#nT?U zZg!rXmz`OXofYo+t66%`noZ_uCD}ze`32K5CS**{Db{+X_(P(l(mS{mo U!hD-2rneCTiY^apCuIKq-vxp&I{*Lx diff --git a/addons/2doptics/cba_optic_small_pip.p3d b/addons/2doptics/cba_optic_small_pip.p3d deleted file mode 100644 index fb66e8d104ec6e1e6e7ef7773f0d16f632279bfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18066 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 diff --git a/addons/2doptics/stringtable.xml b/addons/2doptics/stringtable.xml deleted file mode 100644 index 455157c0c..000000000 --- a/addons/2doptics/stringtable.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Community Base Addons - 2D Optics - Community Base Addons - 2D-Optiken - Community Base Addons - Optyka 2D - - - CBA 2D Optics - CBA 2D-Optiken - CBA Optyka 2D - - - Use picture in picture optics - Bild in Bild-Optiken verwenden - Picture in Picture 照準器を使う - Używaj optyki typu Obraz w obrazie (PIP) - - - diff --git a/addons/optics/$PBOPREFIX$ b/addons/optics/$PBOPREFIX$ new file mode 100644 index 000000000..c0ff57ca4 --- /dev/null +++ b/addons/optics/$PBOPREFIX$ @@ -0,0 +1 @@ +x\cba\addons\optics diff --git a/addons/2doptics/CfgCarryHandleTypes.hpp b/addons/optics/CfgCarryHandleTypes.hpp similarity index 100% rename from addons/2doptics/CfgCarryHandleTypes.hpp rename to addons/optics/CfgCarryHandleTypes.hpp diff --git a/addons/2doptics/CfgEventHandlers.hpp b/addons/optics/CfgEventHandlers.hpp similarity index 100% rename from addons/2doptics/CfgEventHandlers.hpp rename to addons/optics/CfgEventHandlers.hpp diff --git a/addons/2doptics/CfgOpticsEffect.hpp b/addons/optics/CfgOpticsEffect.hpp similarity index 100% rename from addons/2doptics/CfgOpticsEffect.hpp rename to addons/optics/CfgOpticsEffect.hpp diff --git a/addons/2doptics/CfgPIPItems.hpp b/addons/optics/CfgPIPItems.hpp similarity index 100% rename from addons/2doptics/CfgPIPItems.hpp rename to addons/optics/CfgPIPItems.hpp diff --git a/addons/2doptics/RscInGameUI.hpp b/addons/optics/RscInGameUI.hpp similarity index 100% rename from addons/2doptics/RscInGameUI.hpp rename to addons/optics/RscInGameUI.hpp diff --git a/addons/2doptics/XEH_PREP.sqf b/addons/optics/XEH_PREP.sqf similarity index 100% rename from addons/2doptics/XEH_PREP.sqf rename to addons/optics/XEH_PREP.sqf diff --git a/addons/2doptics/XEH_preInit.sqf b/addons/optics/XEH_preInit.sqf similarity index 100% rename from addons/2doptics/XEH_preInit.sqf rename to addons/optics/XEH_preInit.sqf diff --git a/addons/2doptics/XEH_preStart.sqf b/addons/optics/XEH_preStart.sqf similarity index 100% rename from addons/2doptics/XEH_preStart.sqf rename to addons/optics/XEH_preStart.sqf diff --git a/addons/2doptics/cba_optic_big_100.p3d b/addons/optics/cba_optic_big_100.p3d similarity index 82% rename from addons/2doptics/cba_optic_big_100.p3d rename to addons/optics/cba_optic_big_100.p3d index af31d7368044d5b61fef1a1d51763ed056c8b0e2..b2700fa4cffb69b9e7dc62f1458ef8131024ead2 100644 GIT binary patch delta 37 mcmbOt-6Or>4)f%LoKl;AF#EHD7?YDZV}P_dSWtwkff)c6-wlue delta 49 ucmeB?o+7>B4l|Qc%H})FnXEv1@*QTy$!VOS5T?}RtDLe>(apkKmCOLBmJlfb diff --git a/addons/2doptics/cba_optic_big_70.p3d b/addons/optics/cba_optic_big_70.p3d similarity index 82% rename from addons/2doptics/cba_optic_big_70.p3d rename to addons/optics/cba_optic_big_70.p3d index bc2a960b59909337aae1faa324205e4ea253b6b9..927ef9de9b97f1b6f3971cb4c5593f1002ce5aab 100644 GIT binary patch delta 37 mcmbO%-7UT04)f%LoKl;AF#EHD7?YDZV}P_7SWuX&ff)c6i4BYZ delta 49 vcmeB{o-DoL4l|Qc%H)rnikts3d$2;;lhZguAxx>sS2<;X%*`J;XE6f+ymJwC diff --git a/addons/2doptics/cba_optic_big_80.p3d b/addons/optics/cba_optic_big_80.p3d similarity index 82% rename from addons/2doptics/cba_optic_big_80.p3d rename to addons/optics/cba_optic_big_80.p3d index fe74097c8e86bd64bec4d89cdd96e649a7df059c..c4584a8d425032c57a9c7441798221b6b88b5b53 100644 GIT binary patch delta 37 mcmbO%-7UT04)f%LoKl;AF#EHD7?YDZV}P_7SWuX&ff)c6i4BYZ delta 49 vcmeB{o-DoL4l|Qc%H)rnikts3d$2;;lhZguAxx>sS2<;X%*`J;XE6f+ymJwC diff --git a/addons/2doptics/cba_optic_big_90.p3d b/addons/optics/cba_optic_big_90.p3d similarity index 82% rename from addons/2doptics/cba_optic_big_90.p3d rename to addons/optics/cba_optic_big_90.p3d index 845d731241f92f7c1d515932596ce8d4a51ab5f3..a236017eadb4cbabfe98ed561cc09ffe87a28405 100644 GIT binary patch delta 37 mcmbO%-7UT04)f%LoKl;AF#EHD7?YDZV}P_7SWuX&ff)c6i4BYZ delta 49 vcmeB{o-DoL4l|Qc%H)rnikts3d$2;;lhZguAxx>sS2<;X%*`J;XE6f+ymJwC diff --git a/addons/optics/cba_optic_big_pip.p3d b/addons/optics/cba_optic_big_pip.p3d new file mode 100644 index 0000000000000000000000000000000000000000..5651705eb3f58efaf4f161299394f899900953a1 GIT binary patch literal 17778 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 literal 0 HcmV?d00001 diff --git a/addons/2doptics/cba_optic_small_100.p3d b/addons/optics/cba_optic_small_100.p3d similarity index 82% rename from addons/2doptics/cba_optic_small_100.p3d rename to addons/optics/cba_optic_small_100.p3d index 8a49f6a54de8a7c3a5a92e328254303efbd39eab..fff3b85438a508187f86735679bf7757abbbd685 100644 GIT binary patch delta 37 mcmaDZbzf@39p=dgIi)uLVD@JPF(xN-#sFzcu%H-MATt0huMPsS2^XOqMJpzyqE#U91x-a diff --git a/addons/2doptics/cba_optic_small_70.p3d b/addons/optics/cba_optic_small_70.p3d similarity index 82% rename from addons/2doptics/cba_optic_small_70.p3d rename to addons/optics/cba_optic_small_70.p3d index 8c66292f97b134e0f07969f2b4ce0c40bfd596ea..01bb06c875f8cb6fca41edb4b78bd7666a0e4866 100644 GIT binary patch delta 37 mcmaDRbx&%;9p=dgIi)uLVD@JPF(xN-#sFyxu%IYcATt0hSq=pN delta 49 ucmca7^-OBR9cCt@l+AaTGg*Q3sS2^XNqMJpyyqE#Ts}P<5 diff --git a/addons/2doptics/cba_optic_small_80.p3d b/addons/optics/cba_optic_small_80.p3d similarity index 82% rename from addons/2doptics/cba_optic_small_80.p3d rename to addons/optics/cba_optic_small_80.p3d index 5bfb11f3c59935c06131cd4f3aa43fac84d483a7..1d51305b8100a7a0fa74d40ee6a1c187e5175d5d 100644 GIT binary patch delta 37 mcmaDRbx&%;9p=dgIi)uLVD@JPF(xN-#sFyxu%IYcATt0hSq=pN delta 49 ucmca7^-OBR9cCt@l+AaTGg*Q3sS2^XNqMJpyyqE#Ts}P<5 diff --git a/addons/2doptics/cba_optic_small_90.p3d b/addons/optics/cba_optic_small_90.p3d similarity index 82% rename from addons/2doptics/cba_optic_small_90.p3d rename to addons/optics/cba_optic_small_90.p3d index 6f952af8b99ab2f5bca08ce634abe19a96271055..7d7232d2d781225cb28b49018afb064795658ad1 100644 GIT binary patch delta 37 mcmaDRbx&%;9p=dgIi)uLVD@JPF(xN-#sFyxu%IYcATt0hSq=pN delta 49 ucmca7^-OBR9cCt@l+AaTGg*Q3sS2^XNqMJpyyqE#Ts}P<5 diff --git a/addons/optics/cba_optic_small_pip.p3d b/addons/optics/cba_optic_small_pip.p3d new file mode 100644 index 0000000000000000000000000000000000000000..e61b06c222011784d21d8f8e4270512aa37cfb02 GIT binary patch literal 17778 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 @@ -14,7 +14,7 @@ Returns: Examples: (begin example) - player call cba_2doptics_fnc_restartCamera; + player call cba_optics_fnc_restartCamera; (end) Author: diff --git a/addons/2doptics/fnc_setOpticMagnification.sqf b/addons/optics/fnc_setOpticMagnification.sqf similarity index 91% rename from addons/2doptics/fnc_setOpticMagnification.sqf rename to addons/optics/fnc_setOpticMagnification.sqf index 683ebf4fe..13b89c64b 100644 --- a/addons/2doptics/fnc_setOpticMagnification.sqf +++ b/addons/optics/fnc_setOpticMagnification.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" /* ---------------------------------------------------------------------------- -Function: cba_2doptics_fnc_setOpticMagnification +Function: cba_optics_fnc_setOpticMagnification Description: Set magnification of the current optic of the unit. @@ -14,7 +14,7 @@ Returns: Examples: (begin example) - [player, 3] call cba_2doptics_fnc_setOpticMagnification; + [player, 3] call cba_optics_fnc_setOpticMagnification; (end) Author: diff --git a/addons/2doptics/fnc_setOpticMagnificationHelper.sqf b/addons/optics/fnc_setOpticMagnificationHelper.sqf similarity index 78% rename from addons/2doptics/fnc_setOpticMagnificationHelper.sqf rename to addons/optics/fnc_setOpticMagnificationHelper.sqf index a81367970..906abd63d 100644 --- a/addons/2doptics/fnc_setOpticMagnificationHelper.sqf +++ b/addons/optics/fnc_setOpticMagnificationHelper.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" /* ---------------------------------------------------------------------------- -Function: cba_2doptics_fnc_setOpticMagnificationHelper +Function: cba_optics_fnc_setOpticMagnificationHelper Description: Helper function used in config to set the magnification of a zooming optic. @@ -13,7 +13,7 @@ Returns: Examples: (begin example) - 2 call (uiNamespace getVariable 'cba_2doptics_fnc_setOpticMagnificationHelper') + 2 call (uiNamespace getVariable 'cba_optics_fnc_setOpticMagnificationHelper') (end) Author: diff --git a/addons/2doptics/fnc_setOpticMagnificationHelperZeroing.sqf b/addons/optics/fnc_setOpticMagnificationHelperZeroing.sqf similarity index 75% rename from addons/2doptics/fnc_setOpticMagnificationHelperZeroing.sqf rename to addons/optics/fnc_setOpticMagnificationHelperZeroing.sqf index 0e048fb49..11eb06013 100644 --- a/addons/2doptics/fnc_setOpticMagnificationHelperZeroing.sqf +++ b/addons/optics/fnc_setOpticMagnificationHelperZeroing.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" /* ---------------------------------------------------------------------------- -Function: cba_2doptics_fnc_setOpticMagnificationHelperZeroing +Function: cba_optics_fnc_setOpticMagnificationHelperZeroing Description: Helper function used in config to remember the zeroing of a zooming optic. @@ -13,7 +13,7 @@ Returns: Examples: (begin example) - 2 call (uiNamespace getVariable 'cba_2doptics_fnc_setOpticMagnificationHelperZeroing') + 2 call (uiNamespace getVariable 'cba_optics_fnc_setOpticMagnificationHelperZeroing') (end) Author: diff --git a/addons/2doptics/fnc_updateOpticInfo.sqf b/addons/optics/fnc_updateOpticInfo.sqf similarity index 96% rename from addons/2doptics/fnc_updateOpticInfo.sqf rename to addons/optics/fnc_updateOpticInfo.sqf index 457c8d17e..c353044c1 100644 --- a/addons/2doptics/fnc_updateOpticInfo.sqf +++ b/addons/optics/fnc_updateOpticInfo.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" /* ---------------------------------------------------------------------------- -Internal Function: cba_2doptics_fnc_updateOpticInfo +Internal Function: cba_optics_fnc_updateOpticInfo Description: Caches the current optic's parameters in mission namespace variables. @@ -13,7 +13,7 @@ Returns: Examples: (begin example) - player call cba_2doptics_fnc_updateOpticInfo; + player call cba_optics_fnc_updateOpticInfo; (end) Author: diff --git a/addons/2doptics/initSettings.sqf b/addons/optics/initSettings.sqf similarity index 100% rename from addons/2doptics/initSettings.sqf rename to addons/optics/initSettings.sqf diff --git a/addons/2doptics/reticles/pip.rvmat b/addons/optics/reticles/pip.rvmat similarity index 100% rename from addons/2doptics/reticles/pip.rvmat rename to addons/optics/reticles/pip.rvmat diff --git a/addons/2doptics/reticles/scopeblack.rvmat b/addons/optics/reticles/scopeblack.rvmat similarity index 100% rename from addons/2doptics/reticles/scopeblack.rvmat rename to addons/optics/reticles/scopeblack.rvmat diff --git a/addons/2doptics/reticles/scopeblack_big_100_ca.paa b/addons/optics/reticles/scopeblack_big_100_ca.paa similarity index 100% rename from addons/2doptics/reticles/scopeblack_big_100_ca.paa rename to addons/optics/reticles/scopeblack_big_100_ca.paa diff --git a/addons/2doptics/reticles/scopeblack_big_70_ca.paa b/addons/optics/reticles/scopeblack_big_70_ca.paa similarity index 100% rename from addons/2doptics/reticles/scopeblack_big_70_ca.paa rename to addons/optics/reticles/scopeblack_big_70_ca.paa diff --git a/addons/2doptics/reticles/scopeblack_big_80_ca.paa b/addons/optics/reticles/scopeblack_big_80_ca.paa similarity index 100% rename from addons/2doptics/reticles/scopeblack_big_80_ca.paa rename to addons/optics/reticles/scopeblack_big_80_ca.paa diff --git a/addons/2doptics/reticles/scopeblack_big_90_ca.paa b/addons/optics/reticles/scopeblack_big_90_ca.paa similarity index 100% rename from addons/2doptics/reticles/scopeblack_big_90_ca.paa rename to addons/optics/reticles/scopeblack_big_90_ca.paa diff --git a/addons/2doptics/reticles/scopeblack_ca.paa b/addons/optics/reticles/scopeblack_ca.paa similarity index 100% rename from addons/2doptics/reticles/scopeblack_ca.paa rename to addons/optics/reticles/scopeblack_ca.paa diff --git a/addons/2doptics/reticles/scopeblack_small_100_ca.paa b/addons/optics/reticles/scopeblack_small_100_ca.paa similarity index 100% rename from addons/2doptics/reticles/scopeblack_small_100_ca.paa rename to addons/optics/reticles/scopeblack_small_100_ca.paa diff --git a/addons/2doptics/reticles/scopeblack_small_70_ca.paa b/addons/optics/reticles/scopeblack_small_70_ca.paa similarity index 100% rename from addons/2doptics/reticles/scopeblack_small_70_ca.paa rename to addons/optics/reticles/scopeblack_small_70_ca.paa diff --git a/addons/2doptics/reticles/scopeblack_small_80_ca.paa b/addons/optics/reticles/scopeblack_small_80_ca.paa similarity index 100% rename from addons/2doptics/reticles/scopeblack_small_80_ca.paa rename to addons/optics/reticles/scopeblack_small_80_ca.paa diff --git a/addons/2doptics/reticles/scopeblack_small_90_ca.paa b/addons/optics/reticles/scopeblack_small_90_ca.paa similarity index 100% rename from addons/2doptics/reticles/scopeblack_small_90_ca.paa rename to addons/optics/reticles/scopeblack_small_90_ca.paa diff --git a/addons/2doptics/script_component.hpp b/addons/optics/script_component.hpp similarity index 90% rename from addons/2doptics/script_component.hpp rename to addons/optics/script_component.hpp index daeb716d4..802200bea 100644 --- a/addons/2doptics/script_component.hpp +++ b/addons/optics/script_component.hpp @@ -1,16 +1,16 @@ -#define COMPONENT 2doptics +#define COMPONENT optics #include "\x\cba\addons\main\script_mod.hpp" //#define DEBUG_MODE_FULL //#define DISABLE_COMPILE_CACHE -//#define DEBUG_ENABLED_2DOPTICS +//#define DEBUG_ENABLED_OPTICS -#ifdef DEBUG_ENABLED_2DOPTICS +#ifdef DEBUG_ENABLED_OPTICS #define DEBUG_MODE_FULL #endif -#ifdef DEBUG_SETTINGS_2DOPTICS - #define DEBUG_SETTINGS DEBUG_SETTINGS_2DOPTICS +#ifdef DEBUG_SETTINGS_OPTICS + #define DEBUG_SETTINGS DEBUG_SETTINGS_OPTICS #endif #define DEBUG_MODE_NORMAL diff --git a/addons/optics/stringtable.xml b/addons/optics/stringtable.xml new file mode 100644 index 000000000..5a06bd978 --- /dev/null +++ b/addons/optics/stringtable.xml @@ -0,0 +1,21 @@ + + + + + Community Base Addons - Optics + Community Base Addons - Optiken + Community Base Addons - Optyka + + + CBA Optics + CBA Optiken + CBA Optyka + + + Use picture in picture optics + Bild in Bild-Optiken verwenden + Picture in Picture 照準器を使う + Używaj optyki typu Obraz w obrazie (PIP) + + + From f162b2cd8e5637ef2a6fab9204340a977b414794 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sun, 14 Apr 2019 09:33:07 +0200 Subject: [PATCH 2/2] rename 2doptics to optics --- addons/main/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/main/config.cpp b/addons/main/config.cpp index f7957bf3d..cd8dee9f3 100644 --- a/addons/main/config.cpp +++ b/addons/main/config.cpp @@ -32,7 +32,7 @@ class CfgPatches { "cba_jam", "cba_ui", "cba_versioning", - "cba_2doptics" + "cba_optics" }; versionDesc = "C.B.A."; VERSION_CONFIG;