r4566 - in trunk/data: . gfx maps qcsrc/client qcsrc/common qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Oct 1 03:41:26 EDT 2008
Author: div0
Date: 2008-10-01 03:41:23 -0400 (Wed, 01 Oct 2008)
New Revision: 4566
Added:
trunk/data/maps/bloodprisonctf_mini.tga
trunk/data/maps/dismal_mini.tga
trunk/data/maps/ons-reborn_mini.tga
trunk/data/qcsrc/client/teamradar.qc
trunk/data/qcsrc/client/teamradar.qh
Removed:
trunk/data/gfx/ons-reborn_mini.tga
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/client/Main.qc
trunk/data/qcsrc/client/View.qc
trunk/data/qcsrc/client/main.qh
trunk/data/qcsrc/client/progs.src
trunk/data/qcsrc/common/mapinfo.qc
trunk/data/qcsrc/server/ent_cs.qc
trunk/data/qcsrc/server/gamecommand.qc
trunk/data/qcsrc/server/teamplay.qc
Log:
experimental team radar (try: cl_teamradar 1)
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2008-10-01 06:06:36 UTC (rev 4565)
+++ trunk/data/defaultNexuiz.cfg 2008-10-01 07:41:23 UTC (rev 4566)
@@ -1142,3 +1142,5 @@
r_subdivisions_mintess 3
r_subdivisions_maxtess 3
r_subdivisions_tolerance 1000000
+
+set cl_teamradar 0
Deleted: trunk/data/gfx/ons-reborn_mini.tga
===================================================================
(Binary files differ)
Added: trunk/data/maps/bloodprisonctf_mini.tga
===================================================================
--- trunk/data/maps/bloodprisonctf_mini.tga (rev 0)
+++ trunk/data/maps/bloodprisonctf_mini.tga 2008-10-01 07:41:23 UTC (rev 4566)
@@ -0,0 +1 @@
+ 22222222222222222222222222222222222222 22222222222222222 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFFFPZZZZZZZZZZZZZZPPPPPPPPFFFFFFFPPPPPPPPPFFFFFFFFFFFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFFPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFPPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 22222222 FFFFFFFFFFFPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 22222222 FFFFFFFFFFFPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 22222222 FFFFFFFFFFPPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 22222222 FFFFFFFFFFPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 2222ȯ¯¯¯¯¯¯¯xxx¯¯¯¯¯¯¯¯¯¯xxxxxxxxxxx FFFFFFFFFFPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 2222ȯ¯¯¯¯¯¯¯xx¯¯ddd¯¯xxxxxxxxxx FFFFFFFFFPPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 222ȯ¯¯¯¯¯¯¯x¯¯dddiiidddd¯¯xxxxxxxxx FFFFFFFFFPPAZZZZZZZZZZZZA7-------7PFFFFFFFFFFFFFFFFFFFFFFFFF 22ȯ¯¯¯¯¯¯¯¯¯____iii_____¯¯xxxxxxxx FFFFFFFFFPP((((((((((((PPPPPPPPPPPPPPAAAAAAA_________AAAAA((iFFFFFFFFFFFFFFFFFFFFFFFFF ¥¥¥¹È¯¯¯¯¯¯¯¯¯ZZZZZZZZZZZZZZ¯¯¥¥¥22222222222222222 FFFFFFFFFPP((((((((((((APPPPPPPPPPPPPPAAAAAAAi_______iAAAAAA(iFFFFFFFFFFFFFFFFFFFFFFFFF ¥¥¥¥Èd_ZU<<<<<<<<<<<<<<<<<<<<<7<AF¥¥¥22222222222222222 FFFFFFFFPPP((((((((((((AAPPPPPPPPPPPPPPAAAAAAAiPPPPPPPiAAAAAAAiFFFFFFFFFFFFFFFFFFFFFFFFF ¥¥¥¥Èd_ZU<<<<<<<<<<<<<<<<<<<<<7<AF¥¥¥22222222222222222 FFFFFFFPPP7((((((((((((AAAPPPPPPPPPPPPPPAAAAAAZiPPPPPPPiZAAAAAAiFFFFFFFFFFFFFFFFFFFFFFFFF ¥¥¥¥Èd_ZU<<<<<<<<<<<<<<<<<<<<<7<AF¥¥¥22222222222222222 FFFFFFPPPPP7(((((((((((AAPPxxxxxxxxxxxxxxxxiiixxxxxxxxxiiixxiiiiFFFFFFFFFFFF ¥¥¥¥È_ZU<<<<<<<<<<<<<<<<<<<<<7<Ai¥¥¥2222222222222222PPPP FFFFFPPPPPPP7(((((((((AAAPxxZZZZ____ZZZZxxxFFFxZZ___ZZxFFFxxxPPPPxnnnnnnni2 ¥¥¥¥ÈiiU<<<<<<<<<<<<<<<<<<<<<7FFixxxxxx222222222222xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx777P FFFFPPPPPPPPP7(((((((AAAAxxxUUUU____UUUUxxxFFFxUU___UUxFFFxxxPPPPxssssssni2 ¥¥¥¥ÈiiU<<<<<<<<<<<<<<<<<<<<<7FFixxxxxx222222222222xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx777P FFFPPPPPPPPPPP7(((((AAAAiiFPPPPP____PPPPPFFFFFFPiPP___PPiPFFFFFFxPPPPxxxxxxsni2 ¥¥¥¥ÈiiU<<<<<<<<<<<<<<<<<<<<<7FFixxxxxx222222222222xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx777P FFPPPPPPPPPPPPP7(((AAAAiiFFKKKKKKKKKKKKKKFFFFFFFdKKKKKKKdFFFFFFFxPPPPxxxxxxsni2 ¥¥¥¥È_ZU<<<<<<<<<<<<<<<<<<<<<7<Aixxxxxô´´´ÍÍÍÍÍÍÍÍÍÍÍÜÃ}}}}}}}×××××××××ððððððððððð×ðððáááááðÜÜÜÃÃÃÃÃÃÃÃÃÃÃÃþ¾¾× FPPPPPPPPPPPPPPP7(AAAAiiFFFFFFFFFFFFFFFFFFFFF---KFFZZZZFK---FFFFxiiiii2 ¥¥¥¥Èd_ZU<<<<<<<<<<<<<<<<<<<<<7<AFxxxxxô´´´ÍÍÍÍÍÍÍÍÍÍÜÜ}7777777´´´´´ªªªðÍÍÍÍÍÍͯÍÍ;¾¾¾¾ð}} }}}}}þ¾¾× FFPPPPPPPPPPPPPPPPPPAPPxP-FFFFFFFFFFFFFFFFFFFF----77KKKKK77----FFFxiiiii2 ¥¥¥¥Èd_ZU<<<<<<<<<<<<<<<<<<<<<7<AFxxxxxô´´´ÍÍÍÍÍÍÍÍÍÜÜx2222222¥¥¥ðÍÍÍÍÍÍͯÍÍ;¾¾¾¾ðxxxxxxxxxþ¾¾× FFP7PPPPPPPPPPPPPPiPPPxx---FFFFFFFFFFFFFFFFFF-----227777722-----FFxiiiii2 ¥¥¥¥Èd_ZU<<<<<<<<<<<<<<<<<<<<<7<AFxxxxxô´´´ÍÍÍÍÍÍÍÍÜÜx------- ¥ðÍÍÍÍÍÍͯÍÍ;¾¾¾¾ðssssssssxþ¾¾× FFP(7PPPPPPPPPPPPiPPPxxx----FFFFFFFFFFFFFFFF--------22222--------Fxiiiii2 ¥¥¥¥Èd_ZU<<<<<<<<<<<<<<<<<<<<<7<AFxxxxxô´´´ÍÍÍÍÍÍÍÜÜs--((((( ¥ðÍÍÍÍÍÍͯÍÍ;¾¾¾¾ðnnnnnnnsxþ¾¾× FFP((7PPPPPPPPPPiPPPxxxx-----FFFFFKKKKFFFFF---------22222--------dxiiiii2 ¥¥¥¥Èd_sssZsssZZZZZZZ<<<<<<<<<7<AixxxxxÃÃÃÃÃÜÜÜÜÜÜÜÜs-(((((( ¥ðÍÍÍÍÍÍͯÍÍ;¾¾¾¾ðiiiiiiiiinsxþ¾¾× FFP(((7PPPPPPPPiPPPxxUUK-----FFFFFPPPPFFFFF--------------------FKdxiiiii2 ¥¥¥¥Èd_ssxxxxxxxZ<<<<<<<<<7FFixxxxxÃxxxx¹¹¹¹¹s((#(--- ¥ðÍÍÍÍÍÍͯÍÍ;¾¾¾¾ðiPPPPPPPinsxþ¾¾× FFP((((7PPPPPPiPPPxxUUPKF----FFFFFPPPPFFFFF--------------------FKdxiiiii2 ¥¥¥¥È }¥¥ ddddddd<<7FFixxxxxÃxxssn(##(-22 ¥ðÍÍÍÍÍÍͯÍÍ;¾¾¾ÍðiPPPPPPPinsxþ¾¾× FFP(((((7PPPPiPPPxx_UPKFFF---FFFFFPPPPFFFFF--------------------FKdxiiiii2 ¥¥¥¥È¥¥¥¥¥¥¥Èª¥ dddddddd<7FFixxxxxÃxxsnn###(-27 ¥ðÍÍÍÍÍÍͯÍÍ;¾¾¾Íð}xZAAAAA}´´Ã¾¾¾× FFP(((((77PPiPPPxx___KFFFFF--FFFFFFFFFFFFFF----------222---------dxiiiii2 ¥¥¥¥È¥¥¥¥¥ª¯È¯¥ }}}}UK7<Ai¥¥¥ÈÈÜ xsniiiiiii}}}}}}}}}æææææææææææææææææææææææ}UUUUU ¥ÈÈ×ÃÃÃÜ FFP(((((((7iPPPxx____FFFFFFF-FFFFFFFFFFFFFF----------<<<----------xiiiii2 ¥¥¥¥¹}} È¥}_ZZZZ__ddxUK7<AF¥}}}´´ÈiiZ<<FFdddddddæ<77227UUUUUdd}}}}ddUUUPA<7K22###ins_×¹¹¹Ò FFFFFFFFFFP(((((((APPPxxUU__FFFFFFFFFFFFFFFFFFFFFFF----------<<<----------xi2 ¥¥¥¥¹}} È¥}_ZZZZ__ddxUK7<AP¥xxx¯¯ÈiiZ<<FFddddddd檪<772277PPPP__________PP7K<<722###ins_¥¥×¹¹¹Ò FFFFFFFFFFP((((((AAAPxxUUPKFFFPFFFFFFFFFFnnnnnnFFFF----------<<<----------xi2 ¥¥¥¥¹}xxȪ¥}_ZZZZ_nnixUK7<A_¥xxx¯¯ÈiiZ<<FFdddddddæ¾¹ F<<72222222222FFFF222222F777222##22KPd¾¹¹¹Ò FFFFFFFFFFFFPPPPPPPPPPP((((((AAAxxUUPKFFFPPPFFFFFssss }ZZZZZxddddddddddddd¯¯¯¯¯¯¯¯¯¯¯ª¥¥iiiiiiiiiiinnnnPPP¥¥¥¥¹}xxȪ¥}_ZZZZ_nnixUK7<A_¥xxx¯¯Èd_Z<<FFdddddddÿ×Ò¹¯ _ZUPA77222222222222222F7777<-7insx¾¾ðÒÒÒÒ FFFFFFFFFFFFP(((((((AAxxxUPKFFFFPPPPFFFFsss¥¥¥¥¥¥ }ZZZZZxdddddddd__ZZU}xxssd_dªiiiiiiiiiiinnnnPPP¥¥¥¥¹}xssȪ¥}_ZZZZ_nnixUK7<A_¥xxx¯¯Èdd_Z<<FFdddddddÿ´¥ }FA<A#-<72ZUZ_×¹¹¹Ò FFFFFFFFFFFFP(((((((AixxxFKFFFFFPPPFFFFFss ¥¥¥¥¥¥¥¥¥¥}ZZZZZxiiidddd__ZZUUssnniissn__di¯iiiiiiiiiiinnnnPPP¥¥¥¥¹}xssÈ¥}_ZZZZ__ddxUK7<A_¥xxx¯¯Èdd_Z<<FFdddddddÿ´¥ }FA<A#-#72ZUZ_×¹¹¹Ò FFFFFFFFFFFFP(((((((iiFFFF-FFFFFFFFFFFFFs ¥¥¥¥¥¥¥¥¥¥¥}UUUUUsnnn_____ZZUUPniidd_snnZ_di¯iiiiiiiiiiinnnnPPP¥¥¥¥¹xsnnÈ¥}_ZZZZ__ddxUK7<AK¥xxx¯¯Èdd_Z<<FFdddddddÿ´¥ }FKPP(-#<7ini_×¹¹¹Ò FFFFFFFFFFFFi(((((((((((((AAAiFFFF---FFFFFFFFFFFF ¥¥¥¥¥¥¥¥¥¥¥¥}UUUUUsnnn____ZZUUPPdd__ZZUUUZ_di´¥¥¥¥¥¥¥¥¥¥¥¾nnnnPPP¥¥¥¥¹xsnnnnnnnsx¯d_ZZZZ__ddxUK7<AF¥¾¾¾¾¾¾Èdd_Z<<FFddddddd´ÿ´¥ n<<A#(2#7AZPUZ×¹¹¹Ò FFFFFFFFFFFFi(((((((((((((AAAiFFFFF---FFFFFFFFFFn ¥¥¥¥¥¥¥¥¥¥¥¥¥}PPPPPniiiZZZZZUUPPKKFFAA<<<<Z_di´¥¥¥¥¥¥¥¥¥¥¥¾nnnnPPP¥¥¥¥¯iiiiiiiiiii¥d_AAAAAAAAA7<AAPP¥¥¥¥ssdd_Z<<FFddddddd´ÿ´¥ nKKA#######-(((2#7AZPUZ×¹¹¹Ò FFFFFFFFFFFFi(((((((((((((AAAxxxFFFF---FFFFFFFFns¥¥¥¥¥¥¥¥¥¥¥¥¥¥}PPPPPn___ZZZZUUPPKKFFAA<<<<<Z_di´¥¥¥¥¥¥¥¥¥¥¥¾nnnnPPP¥¥¥¥¯iiiiiiiiiii¥d_AAAAAAAAA7<<<AAnxxxddd___Z<<FFddddddd´ÿ´¥ nKKA#######-(((2#7AZPUZ×¹¹¹Ò FFFFFFFFFFFFi(((((((((((((AAAxxxFFFFF---FFFFFFnsx¥¥¥¥¥¥¥¥¥¥¥¥¥¥}KKKKKiUUUUUUUUPPKKFFAA<<<<<<Z_di´¥}}}}}}}}}¥¾nnnnPPP¥¥¥¥¯ddddddddddd¥d_AAAAAAAAA777777dsssZZZZZZZ<<FFddddddd´ÿ´¥ nKKA#######-(((22(<FZPUZ×¹¹¹Ò FFFFFFFFFFFFiPPPPPPPPP7777PPPxxxKFFFFFFFFFFFnsxxx¥¥¥¥¥¥¥¥¥¥¥¥¥¥}KKKKKiZZZUUUUPPKKFFAA<<<<<<<Z_di´¥}}}}}}}}}¥¾¥¥¥¥¥¥¥¥¯dddddddddin¯d_ZZZZ_dnndZUi77777____ZZZZZZZ<<FFddddddd´ÿù n<<A#(2#(<FZPdi×¹¹¹Ò FFFFFFFFFFFFiiiiiiiiiiPPP7PPPxUPKFFFFFFFFFFFnsxxx¥¾¾¾¾¾¾¾¾¾¾¾¾¥}FFFFFd___PPPPPKKFFAA<<<<<<<<Z_di_KKKKKKKKZsiinnnnnn_________di¯d_ZZZZ_dnndZUK<<<<<<<<<<<UU2FFdddddddÿù }FKPP(-7<-<nsi_¥¥×¹¹¹Ò FFFFFFFFFFFFiiiiiiiiiiPPP7PPPxUPKFFFFFFFFFFFnsPPP¥¾¾¾¾¾¾¾¾¾¾¾¾¥sFFFFd___PPPPKKFFAA<<<<<<<<<Z_di_KKKKKKKKZsiinnnnnn_________di¯d_ZZZZ_dnn_ZUK<<<<<<<<<<<UU2FFdddddddÿù }FA<A#-77-(7_ZZ_¥¥×¹¹¹Ò FFFFFFFFFFFFiiiiiiiiiiPPP7PPPxUPKFFFFFFFFFFFnsPPP¥ ¥xZZAA_ZZZKKKKKFFAA<<<<<<<<<<Z_di_KKKKKKKKZs iinnnnnnZZZZZZZZZ_d¯d_ZZZZ_sxsdZUK<<<<<<<<<<issPFFFdddddddÿ }xA<<A#-(77(-(7_ZZ_×¹¹¹Ò FFFFFFFFFFFFiiiiiiiiiiPPP7PPPxUPKFFFFFFFFFFFnsPPP¥ ¥xZZAA_PPPKKKKFFAA<<<<<<<<<<<Z_di_KKKKKKKKZs iinnnnnn¯nnnnnnnnnsxÃd_ZZZZ_sxs}xsnA<722UUUUiiinsx¥ªªª¥¯iiiiiiiiÿÍÍÍÍþ}UKKFFFFFFFFFFFFFFFF7777((--<nssx¯¯ðÒÒÒÒ FFFFFFFFFFFFiiiiiiiiiiFFF-PPPxU___FFFFPPPFFFFiFKP¥ ¥sUU<<ZFFFFFFFFAA<<<<<<<<<<<<Z_di_KKKKKKKKZs iinnnnnn¯nnnnnnnnnsxÃd_ZZZZ_sxs}xsnFA<77ZZZZnnnsx}ªªªªª Uiiii777UZ_d¥¥¥¥¥ZUUP222222222222222222222########(77KPU¹¾¹¹¹Ò FFFFFFFFFFFFiiiiiiiiiiFFF-PPPxU___FFFFPPPFFFFiFKP¥¾¾¾¾¾¾¾¾¾¾¾¾¥i<<<<ZFFFFFFFAA<<<<<<<<<<<<<Z_di_KKKKKKKKZsiinnnnnn¯nnnnnnnnnsxÃd_ZZZZ_dnn}xsnKFA<<____sssx}¯¯¯¯¯¥¥¥ Znnnn<<<Zx}¾¾¾¾¾snnP222222222222222222222222222227nss_ÈÈ×¹¹¹Ò FFFFFFFFFFFFiiiiiiiiiiFFF-PPPxU___FFFFPPPFFFFiFKK ¹¾¾¾¾¾¾¾¾¾¾¾¥}77777UAAAAAAAA<<<<<<<<<<<<<<Z_di_KKKKKKKKZsiinnnnnn¯iiiiiiiiinsÃd_ZZZZ_dnn}xssPKFAAddddxxx}¯¯¯¯¯ªª¥ Kii7<<<<Zx}¾¾¾¾¾snnP77722222777277772777222222222F}sÈÈ×´´´Í FFFFFFFFFFFFiiiiiiiiiiFFF-PPxxUPKFFFFFFFFFFFFinnn´¾¾¾¾¾¾¾¾¾¾¾¥}77777ZFFFFAAA<<<<UUUUUUUUUUUZ_di_KKKKKKKK_}¾¥¥¥¥¥¥¥¥ÃiiiiiiiiinsÃd_ZZZZ_dnn}xxid_ZZ ÃÃÃÃﯪ¥nn<AAAA_}ª¾¾¾¾¾nnP7772222277727777277722222222dd ¥ÈÈ×´´´Í FFFFFFFFFFFFiiiiiiiiiiFFF-PxxxUPKFFFFFFFFFFFFFFFFs¾¾¾¾¾¾ ¾¾¾¾¥}22222UAAAA<<<<<<UZssssssssxdi_KKKKKKKKPi¾¥¥¥¥¥¥¥¥Ãddddnnndddd¹d_AAAAAAFFinsnnddZZZª¹ÃÃﯪªUAAAA_ª¾¾¾¾¾}}P777222227772777727772222222K}} ¥ÈÈ×´´´Í FFFFFFFFFFFFiiiiiiiiiiFFF-xxxxUPKFFFFFFFFFFFFFFFFs¹ÈȪ¾¾¾¾¥}22277_KKKKAA<<<UZZxxxxxxxxxdi_KKKKKKKKPi¾¥¥¥¥¥¥¥¥Ãddddnnndddd¹d_AAAAAAFFinsnnddZ__ª¹ÃÃﯪªZFFFFd¯¾¹¹¹¾}}P777222227772777727772222222PUd}×´´´Í FFFFFFFFFFFFiiiiiiiiiiFFFZxxxxUPKFFFFFFFFFFFFFFFFs´ÈȪ¾¾¾¾¥}222<<nssssFF<<UZZ_}}}}}}¥¥¥¥¥}di_KKKKKKKKPi¾¥¥¥¥¥¥¥¥Ã____iii____¹d_AAAAAAFFinsxid_dd ÃÃÃÃﯪªZFFFFd¯¾¾¾¾¾}}P77722222777277772777222222iiU}×´´´Í FFFFFFFFFFFFiPPPPPPPPP--ZZxxxxxxKFFFFFFFFFFFFFFFF¾ÃÃÃÃþ¹´iii}}sinUUZZ_d}ÈÈÈÈÈÈÈÈÈÈȯ¯´iPKKKKKKKPi¾¥¥¥¥¥¥¥¥Íid__ddd__diÃd_ZZZZ_dnn¥ ¯¥¥ª ÃÃÃÃﯪ¥xxFKKKKi´¾¾¾¾¾ ssU<<<77777<<<7<<<<7<<<¥¥×××ÈÈÍÒ×ðÍÍÍÍ FFFFFFFFFFFFiAAAAZZZZZ2___xxxKFFFFF----------xxxxxxxxxx ¥ª¯ÃÃþ¹nnnnnnnn_ZsZZZ_ddÈÈÈÈÈÈÈÈÈÈÈȯ¯´iPKKKKKKKPi¾¥¥¥¥¥¥¥¥Íd_ZZZZZZZ_dÃd_ZZZZ_dnn¥ ¯}}}}}ª ÃÃÃÃ瘟 ZxxFKKKKi¾¾¾¾¾xssU<<<#####(((#((((#(((¥¥¥¥¥¥×××××××××ðZZZZ FFFFFFFFFFFFiAAAAZZZZZ____xxxKFFFF----------xxxxxxxxxxx ¥ª¯ÃÃÃþssssnnnd_xn__dd¯ÈÈÈÈÈÈÈÈÈÈÈȯ¯´iPKKKKKKKPi¾¥¥¥¥¥¥¥¥Íd_ZZZZZZZ_dÃd_ZZZZ_dnn¥ }}}}}ªª¹ÃÃ瘟 _}}KPPPPn¾¹¹¹¾}xxZAAA(((((---(----(---¥¥¥¥¥××××××××××ðZZZZ FFFFFFFFFFFFiAAAAZZZZ____xxxKFFF----------xxxxxxxxxxxx ¥ª¯ÃÃÃÃÃxxxxiiiid}}ddd¯¯ÈÈÈÈÈÈÈÈÈÈÈȯ¯´dPKKKKKKKPd¾¥¥¥¥¥¥¥¥Íd_ZZZZZZZ_dÃd_ZZZZ_dnn¥ }}}}}ªª¹ÃÃ瘟 _}}KPPPPn¾¹¹¹¾}xxZAAA<((((---(----(---¥¥¥×××××××××××ðZZZZ FFFFFFFFFFFFiAAAAZZZ____xUPKFF----------xxxxxxxnxxxxx ¥ª¯ÃÃÃÃÃ}}}}xxxxiii¯¯¯ÈÈÈÈÈÈÈÈÈÈÈȯ¯´_PKKKKKKKP_¾¥¥¥¥¥¥¥¥Íd_ZZZZZZZ_dÃd_ZZZZ_sxs¥ }}}}}ªª¹ÃÃ瘟 _}}KPPPPn¾ÃÃþ}xxZUUU<((((AAA(AAAA(AAA¾ðððððððððð××ðZZZZ FFFFFFFFFFFFiAAPPiixUPKF---KKKKKKKªª}¹¹¹´¯ÃÃÃÃà ¯ª ´´´ÍÍÍÍÍÍÍÍÍÍÍÍ´´´ZPKKKKKKKPZ¾ªªªªªªªªÍd_ZZZZZZZ_dà ª¥ ´ ª ÃÃÃÃï´¹¹¹UUUUUs¾ÃÃþ}}siss_____U____U___U_´ÃÃÜðððððððððð××ðZZZZ FFFFFFFFFFFFiAAPPixUPKF---Kiiiii´´´´ÈÈxZnnnsss ªxsxx_ZZZZZ_xxsxªÍÍÍÍÍÍÍÍÍ; ´UPKKKKKKKPU¾ªªªªªªªª¾UPKKKKKKKPU´ ª}}xsxx_ZZZZZ_xdsxª nnnUUUUsx}¥¥¥¥¥iddsnsPPPPPUPUUUUPUUUPU¥´´ÍÍÍÍÍÍÍÍÍÍÍ´´Í FFFFFFFFFFFFiAAPPxUPKF---Kiinn¹¹¹¹ÍÍxZ___sss}}ªxs_sKKKKKKKs_sx¥ÍÍÍÍÍÍÍÍÍ; ´UPPP___PPPU¾ªªªªªªªª¾UPKK___KKPU´ª}xxxs_sKKKKKKKs_sxª}}sssZZZZx}¥¥¥¥¥¥iixxdUUUUUZZZZZZZZZZZ´´´ÍÍÍÍÍÍÍÍÍÍÍ´´Í FFFFFFFFFFFFiAAPxxUPKF---Kiin¾¾¾¾ÒÒxZ___sss}xªxsZdddddddddZsx ÍÍÍÍÍÍÍÍÍ; ´UUUU___UUUU¾ªªªªªªªª¾UPKK___KKPU´ªxssxsZdddddddddZsxªx}sssZZZZx¥¥¥¥¥¥xxxUUUUUUUUUUUUUUUUsx´´´ÍÍÍÍÍÍÍÍÍÍÍ´´Í xxxxxUPKF---Kii¹ÜÜÜðð xZ___ZZZ ¥¥ni___________inÃÃÃÃÃÃÃÃÃÃÃÃÃÃ}}}}}}}}}}}ÜÜÜÜÜÃÃÃÃÃÃÃÃÜÜÜÜÜ}}}}}}}}}}}ê ¥¥¹}}ni___________in¥¥ ZZZZZZZx¥¥¥¥¥¥}¯i77ZZZZZZZZZZZZZZx}´´´ÍÍÍÍÍÍÍÍÍÍÍ´´Í xxxxxxxxxxxxxxxxnnnnUUPKF---Ki´¹ÜÜððð xZ___ZZZZZUPFPPUUU---------AAAAAAAAAA____dinnZZZZZZZZZZZssiZZAAAAAAAAZZissZZZZZZZZZZZnnid_AAAAAAAAAAAAA---------UUUPPFPUZZZZZZZZZx ¾¾¾¾¾¾´ÈÈi77FFFFFFFdixxxxx xxxxxxxxxxxxxxxxiiixxxxiiiPPPKF---K´´¹Üðððð xZ___ZZZZZUPFPPUUU---------AAAAAAAAAAZZZ_dinnZZZZZZZZZZZssiZZAAAAAAAAZZissZZZZZZZZZZZnnid_AAAAAAAAAAAAA---------UUUPPFPUZZZZZZZZZx¾¾¾¾¾¾ë¾ªn<######KKK#KKKK#KKxxxxx xxxxn_____ssss___FFFFA(((¯¯´ððÒëð xZ___ZZZZZZZUPPUUU---222---AAAAAAAAAAAAA_dinnZZZZ___ZZZZssiZZAAAAAAAAZZissZZZZ___ZZZZnnid_AAAAAAAAAAAAA---222---UUUPPUZZZZZZZ___Zx ¾ÒÒÒðêªn###################ixxxx xxxxiAAAAAAAAAAAAAAAAA((s¯¯ÈðëÜëð xZ___ZZZZZZZUPPUUU---222---AAAAAAAAAAAAA_dinnZZZZ___ZZZZssiZZAAAAAAAAZZissZZZZ___ZZZZnnid_AAAAAAAAAAAAA---222---UUUPPUZZZZZZZ___Zx ðëÜð𴯯(((AFFFFFFFFFFFFFFFFnxxxx xxxxi##################<nª¾Ã¾ÍÍ; xZ___ZZZZZZZUPPUUU---222---AAAAAAAAAAAAA_dinnZZZZ___ZZZZssiZZAAAAAAAAZZissZZZZ___ZZZZnnid_AAAAAAAAAAAAA---222---UUUPPUZZZZZZZ___Zx ðëáðÜ´¯¯F(((AFKKKdddssssdddddsxxxx xxxxxKK#KKKK#KKK#####<<n¾¾¹¾¾¾¾¾¾xZZZZZZZZZUPFPPUUU---------AAAAAAAAAAAAA_dinnZZZZZZZZZZZssiZZAAAAAAAAZZissZZZZZZZZZZZnnid____AAAAAAAAAA---------UUUPPFPUZZZZZ___Zx ðððÜܹ´iK---FKPUUnnnxxxxnnnxxxxxxxxxxxxxxxx xxxxxidFFFFFFF777iÈ´¾¾¾¾¾¾ xZZZZZZZZZUPFPPUUU---------AAAAAAAAAAAAA_dinnZZZZZZZZZZZssiZZAAAAAAAAZZissZZZZZZZZZZZnnid____AAAAAAAAAA---------UUUPPFPUZZZZZ___Zx ððÜÜܹiiK---FKPUUnnnnxxxxxxxxxxxxxxxx Í´´ÍÍÍÍÍÍÍÍÍÍÍ´´´}xZZZZZZZZZZZZZZ77}}}¥¥¥¥¥¥xZZZZZZZ ¥¥ni_sssssssss_in}}¹¥¥ ªÃ}}}}}}}}}}}ÜÜÜÜÜÃÃÃÃÃÃÃÃÜÜÜÜÜ}}}}}}}}}}}ÃÃÃÃÃÃÃÃÃÃÃÃÃÃni_sssssssss_in¥¥ ZZZ___ZxÒðÜÜÜÜniiK---FKPUxxxxx Í´´ÍÍÍÍÍÍÍÍÍÍÍ´´´xsUUUUUUUUUUUUUUUixxx¥¥¥¥¥¥xZZZZsss}xªxsZdPPPPPPPdZsxssxª´UPKK___KKPU¾ªªªªªªªª¾UUUU___UUUU´ ¾ÍÍÍÍÍÍÍÍÍÍ xsZdPPPPPPPdZsxªx}sss___ZxÍ͹¹¹¹nniiK---FKPUxPPAAiFFFFFFFFFFFF Í´´ÍÍÍÍÍÍÍÍÍÍÍ´´´ZZZZZZZZZZZUUUUUxxxii¥¥¥¥¥¥}xZZZZsss}}ªxs_sKKKKKKKs_sxxx}ª´UPKK___KKPU¾ªªªªªªªª¾UPPP___PPPU´ ¾ÍÍÍÍÍÍÍÍÍÍ¥xs_sKKKKKKKs_sxª}}sss___ZxÈÈ´´´´iiiiiK---FKPUxiPPAAiFFFFFFFFFFFF Í´´ÍÍÍÍÍÍÍÍÍÍÍ´´¥UKUUUKUUUUKUPPPPdsZsddi¥¥¥¥¥}xsUUUUnnn ªxsdx_ZZZZZ_x}sx}}ª ´UPKKKKKKKPU¾ªªªªªªªª¾UPKKKKKKKPU´ ¾ÍÍÍÍÍÍÍÍÍͪxs}x_ZZZZZ_x}sxª sssnnnZªÈ´´´´iiiiiiK---FKPUxiiPPAAiFFFFFFFFFFFF ZZZZð××ðððððððððððÃô_P___P____P_____ssds}}¾ÃÃþsUUUUU¹¹¹´¯ÃÃÃÃà ª ´ ¥ª Ãd_ZZZZZZZ_dͪªªªªªªª¾ZPKKKKKKKPZ´´´ÍÍÍÍÍÍÍÍÍÍÍÍ´´´ ª¯ ÃÃÃÃï´¹¹¹}ªKKKKKKKK---FKPUxiiiPPAAiFFFFFFFFFFFF ZZZZð××ðððððððððð¾¥<<<(<<<<(<<<((((<PPPZxx}¾¾¾¾¾nPPPPK}}_ ¥ª¯ÃÃùªª}}}}} ¥sxs_ZZZZ_dÃd_ZZZZZZZ_dÍ¥¥¥¥¥¥¥¥¾_PKKKKKKKP_´¯¯ÈÈÈÈÈÈÈÈÈÈÈȯ¯idd}}dssssxxxxÃÃÃÃ瘟 xxxxxnxxxxxx-----------FFKPUx____ZZZZAAAAiFFFFFFFFFFFF ZZZZð×××××××××××¥¥¥¥---(----(---(((((AAAZxx}¾¹¹¹¾nPPPPK}}_ ¥ª¯ÃÃùªª}}}}} ¥nnd_ZZZZ_dÃd_ZZZZZZZ_dÍ¥¥¥¥¥¥¥¥¾dPKKKKKKKPd´¯¯ÈÈÈÈÈÈÈÈÈÈÈȯiddd}}diiiixxxxÃÃÃÃ瘟 xxxxxxxxxxx-----------FFFKxxx____ZZZZZAAAAiFFFFFFFFFFFF ZZZZð××××××××××¥¥¥¥¥(((#((((#(((#####<<<Ussx¾¾¾¾¾iKKKKFxxZ ¥ª¯ÃÃÃÃà ª}}}}}¯ ¥nnd_ZZZZ_dÃd_ZZZZZZZ_dÍ¥¥¥¥¥¥¥¥¾iPKKKKKKKPi´¯¯ÈÈÈÈÈÈÈÈÈÈÈÈid___ix_dnnnss}ss¾ÃÃÃ瘟 xxxxxxxxxx-----------FFFFKxxx___2ZZZZZAAAAiFFFFFFFFFFFF ÍÍÍÍð×ÒÍÈÈ××××¥<<<7<<<<7<<<77777<<<Uss ¾¾¾¾¾´iKKKKFxx¥ª¯¯ÃÃÃÃà ª¯ ¥nnd_ZZZZ_dÃid_______diÍ¥¥¥¥¥¥¥¥¾iPKKKKKKKPi´¯¯ÈÈÈÈÈÈÈÈÈÈÈd__ZZZsdixxxxxnnn¹¾ÃÃÃÃþ¹FFFFFFFFFFFFFFFFKxxxxxxZZ--PPPPPPPPPiFFFFFFFFFFFF Í´´´×}U nn22222277727777277722222777P}}¾¾¾¾¾¯dFFFFZªª¯¯ÃÃÃÃà ¥ ¥in_dixsniFFAAAAAA_d¹____iii____Ã¥¥¥¥¥¥¥¥¾iPKKKKKKKK_ii¥¥¥¥¥}__ZZ<<PKn_AF222}¥¾¾¾¹ªÈȯsFFFFFFFFFFFFFFFFKPUxxxxZFFFiiiiiiiiiiFFFFFFFFFFFF Í´´´×}dUU222222277727777277722222777P}}¾¹¹¹¾¯dFFFFZªª¯¯ÃÃùªªddZddnnsniFFAAAAAA_d¹ddddnnnddddÃ¥¥¥¥¥¥¥¥¾iPKKKKKKKK_id}}}}}}}}x_ZZ<<<FFUUUUZ<<222}¥¾¾¾¾ªÈÈ´sFFFFFFFFFFFFFFFFKPUxxxx-FFFiiiiiiiiiiFFFFFFFFFFFF Í´´´×ÈÈ¥ P222222277727777277722222777P}}¾¾¾¾¾ª_AAAAUªª¯¯ÃÃùª__ZddnnsniFFAAAAAA_d¹ddddnnnddddÃ¥¥¥¥¥¥¥¥¾iPKKKKKKKK_idxxxxxxxxxZZ<<<<AAFFFFU77222}¥¾¾¾¾¾¾¾¾¾¾sFFFFFFFFFFFFFFFFKPUxxxP-FFFiiiiiiiiiiFFFFFFFFFFFF Í´´´×ÈÈ¥ dd2222222277727777277722222777Pnn¾¾¾¾¾ª}_AAAA<nn¥ª¯¯ÃÃÃÃà ZZ_dixx}nnd_ZZZZ_dÃsniinnniiiiÃ¥¥¥¥¥¥¥¥¾}_KKKKKKKK_id_ZZZZZZZZZZZZ<<<<<AAFFFFU77777}¥¾¾¾¾¾¾¾¾¾¾¾¯iiiiFFFFFFFFFFFFKPUxxPP-FFFiiiiiiiiiiFFFFFFFFFFFF Í´´´×ÈÈ¥K22222222277727777277722222777Pnns¾¾¾¾¾}xZ<<<<7iiK ¥ª¯¯¯¯¯¯}}nnnnFFKPUxsx}nnd_ZZZZ_dÃsniiiiiiiii¯nnnnnniisZKKKKKKKK_id_Z<<<<<<<<<<<<<<<AAAFFFFU77777}¥¾¾¾¾¾¾¾¾¾¾¾´FFFiFFFFPPPFFFF___UxPPP-FFFiiiiiiiiiiFFFFFFFFFFFF Ò¹¹¹×ÈÈssn722222222277727777277722222777Pnns¾¾¾¾¾}xZ<<<nnnnZ ¥ªª¯¯¯¯¯}xxxddddAAFKPssx}nnd_ZZZZ_dÃxsnnnnnnnnn¯nnnnnniisZKKKKKKKK_id_Z<<<<<<<<<<<<<<AAFFFFFFZ<<<<i¥¾¾¾¾¾¾¾¾¾¾¾¹ KKFiFFFFPPPFFFF___UxPPP-FFFiiiiiiiiiiFFFFFFFFFFFF Ò¹¹¹¾¹PK77(########222222222222222222222PUUZ¥¥¥¥¥d_ZU777iiiiU ¥¥¥ªªªªª}xsss____<<AFKnsx}sxs_ZZZZ_dÃxsnnnnnnnnn¯nnnnnnii sZKKKKKKKK_id_Z<<<<<<<<<<<<<AAFFFFFFFZ<<UUs¥ ¥PKFiFFFFPPPFFFF___UxPPP-FFFiiiiiiiiiiFFFFFFFFFFFF ÒÒÒÒðá¯xssn<--((((((FFFFFFFFFFFFFFFFKKU}¾ÃÍÍÍÍÿiiiiiiii´ ¥ªªª¥}xsnnnZZZZ77<AFnsx}sxs_ZZZZ_dÃxsnnnnnnnnn¯nnnnnnii sZKKKKKKKK_id_Z<<<<<<<<<<<<AAFFKKKKKK_AAZZx¥ ¥PPPsnFFFFFFFFFFFKPUxPPP7PPPiiiiiiiiiiFFFFFFFFFFFF Ò¹¹¹×_ZZ_7(-((7777F#A<<Ax} ÿdddddddFFKPssn<<<<<<<<<<KUZdsxs_ZZZZ_d¯d_ZZZZZZZZZnnnnnnii sZKKKKKKKK_id_Z<<<<<<<<<<<AAFFKKKKZZZ_AAZZx¥ ¥PPPsnFFFFFFFFFFFKPUxPPP7PPPiiiiiiiiiiFFFFFFFFFFFF Ò¹¹¹×_ZZ_7(-777-#A<<Ax} ÿdddddddFFAKnnd<<<<<<<<<<KUZdsxs_ZZZZ_d¯d_ZZZZZZZZZnnnnnnii sZKKKKKKKK_id_Z<<<<<<<<<<AAFFKKKKKZZZ_AAZZx¥ ¥PPPsnFFFFFFFFFFFKPUxPPP7PPPiiiiiiiiiiFFFFFFFFFFFF Ò¹¹¹×¥¥_ZZ_7(<7-#A<AF} ¹ÃÿdddddddFF2UU<<<<<<<<<<<KUZ_nnd_ZZZZ_d¯id_________nnnnnniisZKKKKKKKK_id_Z<<<<<<<<<AAFFKKPPPP___dFFFFs¥¾¾¾¾¾¾¾¾¾¾¾¾¥xxPsnFFFFFFFFFFFKPUxPPP7PPPiiiiiiiiiiFFFFFFFFFFFF Ò¹¹¹×¥¥_isn<-<-(PPKF} ¹ÃÿdddddddFF2UU<<<<<<AAAAAKUZdnnd_ZZZZ_d¯id_________nnnnnniisZKKKKKKKK_id_Z<<<<<<<<AAFFKKPPPPP___dFFFFF}¥¾¾¾¾¾¾¾¾¾¾¾¾¥xxxsnFFFFFFFFFFFKPUxPPP7PPPiiiiiiiiiiFFFFFFFFFFFF Ò¹¹¹×idPZF<(22(#A<<n ¹Ãÿ´dddddddFF<<ZZZZZZ_____77777iUZdnnd_ZZZZ_d¯niddddddddd¯¥¥¥¥¥¥¥¥¾¥}}}}}}}}}¥´id_Z<<<<<<<AAFFKKPPUUUUUUUiKKKKK}¥¥¥¥¥¥¥¥¥¥¥¥¥¥xxxsnFFFFFFFFFFFKxxxPPP7777PPPPPPPPPiFFFFFFFFFFFF Ò¹¹¹×ZUPZF<(2(((-#######AKKn ¥´ÿ´dddddddFF<<Z___ddisssiAA<<<7AAAAAAAAA_d¥ddddddddddd¯¥¥¥¥PPPnnnn¾¥}}}}}}}}}¥´id_Z<<<<<<AAFFKKPPUUUUUUUUiKKKKK}¥¥¥¥¥¥¥¥¥¥¥¥¥¥snnFFFFFFF--FFFFFxxxAAA(((((((((((((iFFFFFFFFFFFF Ò¹¹¹×ZUPZA7#2(((-#######AKKn ¥´ÿ´dddddddFF<<Z_ddnn}}KKAA<7AAAAAAAAA_d¥iiiiiiiiiii¯¥¥¥¥PPPnnnn¾¥¥¥¥¥¥¥¥¥¥¥´id_Z<<<<<AAFFKKPPUUZZZZ___nPPPPP}¥¥¥¥¥¥¥¥¥¥¥¥¥ nnFFFFFFFFF--FFFFxxxAAA(((((((((((((iFFFFFFFFFFFF Ò¹¹¹×ZUPZA7#2(((-#######AKKn ¥´ÿ´dddddddFF<<Z_dd} Z_FA<7AAAAAAAAA_d¥iiiiiiiiiii¯¥¥¥¥PPPnnnn¾¥¥¥¥¥¥¥¥¥¥¥´id_Z<<<<AAFFKKPPUUZZZZZiiinPPPPP}¥¥¥¥¥¥¥¥¥¥¥¥ nFFFFFFFFFFF--FFFFFiAAA(((((((((((((iFFFFFFFFFFFF Ò¹¹¹×ZUPZA7#2(#A<<n ¥´ÿ´dddddddFF<<Z_ddÈ´´´´´´¥FA<7KUxdd__ZZZZ_d¯xsnnnnnnnsx¹¥¥¥¥PPPnnnn¾¥¥¥¥¥¥¥¥¥¥¥´id_ZZZZ__ddiiPPUUZZ____nnnsUUUUU}¥¥¥¥¥¥¥¥¥¥¥ FFFFFFFFFFFFF-FFFFFiAAA(((((((((((((iFFFFFFFFFFFF Ò¹¹¹×_ini7<#-(PPKF} ¥´ÿdddddddFF<<Z_ddȯ¯xxx¥PA<7KUxdd__ZZZZ_}¥Ènnsx¹¥¥¥¥PPPnnnniiiiiiiiiii¯id__nnsdiinnsPUUZZ_____nnnsUUUUU}¥¥¥¥¥¥¥¥¥¥ sFFFFFFPFFFFFFFFFFFii(((((((PFFFFFFFFFFFF Ò¹¹¹×_ZUZ27#-#A<AF} ¥´ÿdddddddFF<<Z_ddȯ¯xxx¥_A<7KUxdd__ZZZZ_}¥Èssx}¹¥¥¥¥PPPnnnniiiiiiiiiiiªd_ddnssnnssxxUUZZ__dddddddxZZZZZ} ¥¥¥¥¥¥ssFFFFFPPPFFFFFKKxxxiA(((((((PFFFFFFFFFFFF Ò¹¹¹×_ZUZ27<-#A<AF} ¥´ÿdddddddFF<<Z_ddȯ¯xxx¥_A<7KUxinn_ZZZZ_}¥ªÈssx}¹¥¥¥¥PPPnnnniiiiiiiiiii¥_dixx}}UZZ__ddddddddxZZZZZ}¥¥¥¥¥¥sssFFFFPPPPFFFFKPUxxxAA(((((((PFFFFFFFFFFFF ÒÒÒÒð¾¾xsni7-<7<<<K777777777777777<<FPUZ_ ¯¹Ò×ÿdddddddFF<<Z_dȯ¯xxx¥_A<7KUxinn_ZZZZ_}¥ªÈxx}¹¥¥¥¥PPPnnnniiiiiiiiiii ¥ª¯¯¯¯¯¯¯¯¯¯¯ddddddddddiiixZZZZZ}}}} ssssFFFFFPPPFFFKPUZxxAAA((((((PPPPPPPPPPPFFFFFFFFFFFF Ò¹¹¹¾dPK22##2227<<K777777FFFF77777777727<<F ¹¾ædddddddFF<<Ziiȯ¯xxx¥_A<7KUxinn_ZZZZ_}¥ªÈxx}¹¥¥¥¥ 2ix----------<<<----------FFFFnnnnnnFFFFFFFFFFFFFFKPUZxxPPAA((((((PFFFFFFFFFF Ò¹¹¹×¥¥_sni###2227<AP<UUddd____dddUUUU<72277<ªªædddddddFF<<Ziiȯ¯xxx¥FA<7KUxdd__ZZZZ_}¥È }}¹¥¥¥¥ 2ix----------<<<----------FFFFFFFFFFFFFFFFFFFFFF____ZxxPPPP(((((((PFFFFFFFFFF Ò¹¹¹×_sni####2KP<APUUUdd}}}}ddUUUUU72277<ædddddddFF<<Ziiȹ¹¥FA<7KUxdd__ZZZZ_}¥È }}¹¥¥¥¥ 2iiiiix----------<<<----------FFFFFFFFFFFFFF-FFFFFFF____xxPPPiP7((((((PFF ÜÃÃÃ×ÈÈ¥ UUUUUnæææææææææææææææææææææææ}}}}nnnnnnnnsx ×Ãà iA<7KU}}}} ¥¯È¯ª¥¥¥¥¥È¥¥¥¥ 2iiiiixd---------222----------FFFFFFFFFFFFFF--FFFFFKP__xxPPPiPPP7(((((PFF ×¾¾¾Ã´´}AAAAAZx}ð;¾¾¾ÍÍͯÍÍÍÍÍÍÍð¥ 22-(###nnsxxÃxxxxxiFF7<dddddddd ¥¥ ¥¥¥¥¥¥¥È¥¥¥¥ 2iiiiixdKF--------------------FFFFFPPPPFFFFF---FFFKPUZxxPPPiPPPPP7((((PFF ×¾¾¾ÃxsniPPPPPPPið;¾¾¾ÍÍͯÍÍÍÍÍÍÍð¥ ---(##(nssxxÃxxxxxiFF7<<ddddddd xx È¥¥¥¥ 2iiiiixdKF--------------------FFFFFPPPPFFFFF----FKPUZxxPPPiPPPPPPP7(((PFF ×¾¾¾ÃxsniPPPPPPPið¾¾¾¾¾ÍÍͯÍÍÍÍÍÍÍð¥ ---(#((s¹¹¹¹¹xxxxÃxxxxxiFF7<<<<<<<<<Zxxxxxxxss_dÈ¥¥¥¥ 2iiiiixdKF--------------------FFFFFPPPPFFFFF-----KUZxxPPPiPPPPPPPPP7((PFF ×¾¾¾Ãxsniiiiiiiiið¾¾¾¾¾ÍÍͯÍÍÍÍÍÍÍð¥ ((((((-sÜÜÜÜÜÜÜÜÜÃÃÃÃÃxxxxxiA<7<<<<<<<<<ZZZZZZZsssZsss_dÈ¥¥¥¥ 2iiiiixd--------2222----------FFFFFFFFFFFFFF-----xxxxPPPiPPPPPPPPPPP7(PFF ×¾¾¾Ãxsnnnnnnnð¾¾¾¾¾ÍÍͯÍÍÍÍÍÍÍð¥ (((((--xÜÜÍÍÍÍÍÍÍÍ´´´´ÃxxxxxFA<7<<<<<<<<<<<<<<<<<<<<<UZ_dÈ¥¥¥¥ 2iiiiixF--------7777---------FFFFFFFFFFFFFFFF----xxxPPPiPPPPPPPPPPPPP7PFF ×¾¾¾Ãxssssssssð¾¾¾¾¾ÍÍͯÍÍÍÍÍÍÍð¥ ------2xÜÜÍÍÍÍÍÍÍÍÍ´´´´ÃxxxxxFA<7<<<<<<<<<<<<<<<<<<<<<UZ_dÈ¥¥¥¥ 2iiiiixFF-----22<<<<222-----FFFFFFFFFFFFFFFFFF---xxPPPiPPPPPPPPPPPPPPPPFF ×¾¾¾Ãxxxxx xxð¾¾¾¾¾ÍÍͯÍÍÍÍÍÍÍ𥥥´´´´´2222222}ÜÜÍÍÍÍÍÍÍÍÍÍ´´´´ÃxxxxxFA<7<<<<<<<<<<<<<<<<<<<<<UZ_dÈ¥¥¥¥ 2iiiiixFFF----<<ZZZZ<<<----FFFFFFFFFFFFFFFFFFFF-PiAAAPPPPPPPPPPPPPPPPPF ×¾¾¾ÃÃÃÃÃÃÃÃÃÃÃÃÃÜÜÜðáááááððð×ððððððððððð×××××××××}}}}}}}ÃÜÍÍÍÍÍÍÍÍÍÍÍ´´´´ÃxxxxxiA<7<<<<<<<<<<<<<<<<<<<<<UZ_È¥¥¥¥ 2insxxxxxxPPPPxFFFFFFF_UUUUUUU_FFFFFFFFFFFFFFFFFFFFFFFFiiAAAA(7PPPPPPPPPPPPPPFF P777xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx222222222222xxxxxxiFF7<<<<<<<<<<<<<<<<<<<<<UiiÈ¥¥¥¥ 2insxxxxxxPPPPxFFFFFFKdKK___KKdKFFFFFFKKKKK____KKKKKFFiiAAAA(((7PPPPPPPPPPPPFFF P777xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx222222222222xxxxxxiFF7<<<<<<<<<<<<<<<<<<<<<UiiÈ¥¥¥¥ 2insxxxxxxPPPPxxxFFFxPP___PPxFFFxxxPPPP____PPPPxxxiAAAA(((((7PPPPPPPPPPFFFF P777xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx222222222222xxxxxxiFF7<<<<<<<<<<<<<<<<<<<<<UiiÈ¥¥¥¥ 2inssssssxPPPPxxxFFFxUU___UUxFFFxxxUUUU____UUUUxxxAAAA(((((((7PPPPPPPPFFFFF PPPP2222222222222222¥¥¥iA<7<<<<<<<<<<<<<<<<<<<<<UZ_È¥¥¥¥ FFFFFFFFFFFFiiiixxiiixxxxxxxxxiiixxxxxxxxxxxxxxxxxPAAA(((((((((7PPPPPPFFFFFF 22222222222222222¥¥¥FA<7<<<<<<<<<<<<<<<<<<<<<UZ_dÈ¥¥¥¥ FFFFFFFFFFFFFFFFFFFFFFFFFiAAAAAAZiPPPPPPPiZAAAAAAPPPPPPPPPPPPPPAAAA(((((((((((7PPPPFFFFFFF 22222222222222222¥¥¥FA<7<<<<<<<<<<<<<<<<<<<<<UZ_dÈ¥¥¥¥ FFFFFFFFFFFFFFFFFFFFFFFFFiAAAAAAUiPPPPPPPiUAAAAAAPPPPPPPPPPPPPPAAA((((((((((((7PPFFFFFFFF 22222222222222222¥¥¥FA<7<<<<<<<<<<<<<<<<<<<<<UZ_dÈ¥¥¥¥ FFFFFFFFFFFFFFFFFFFFFFFFFi(AAAAAAiPPPPPPPiAAAAAAAPPPPPPPPPPPPPPAA((((((((((((PPFFFFFFFF 22222222222222222¥¥¥¯UUUUUUUUUUUUUUUU¯¯¯¯¯¯¯¯È¥¥¥¥ FFFFFFFFFFFFFFFFFFFFFFFFFi((AAAAAiiiiiiiiiAAAAAAAPPPPPPPPPPPPPPA((((((((((((PPFFFFFFFF 22222222222222222¥¥¥¯¯ZZZZZZZZZZZZZZ¯¯¯¯¯¯¯¯¯È¹¥¥¥ FFFFFFFFFFFFFFFFFFFFFFFFFi(((AAAAPPPPPPPPPAAAAAAAPPPPPPPPPPPPPP((((((((((((PPPFFFFFFFF xxxxxxxx¯¯_____iii____¯¯¯¯¯¯¯¯¯¯È22 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPFFFFFFFFF xxxxxxxxx¯¯ddddiiiddd¯¯x¯¯¯¯¯¯¯¯È222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPFFFFFFFFF xxxxxxxxxx¯¯iii¯¯xx¯¯¯¯¯¯¯¯È2222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPPFFFFFFFFF xxxxxxxxxxx¯¯¯¯¯¯¯¯¯¯xxx¯¯¯¯¯¯¯¯È2222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPFFFFFFFFFF 22222222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPFFFFFFFFFF 22222222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPFFFFFFFFFF 22222222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPPFFFFFFFFFFF 22222222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZAPPPFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFFFFFFFFFFFP7-------7AZZZZZZZZZZZZZPFFFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFFFFFFFFFFFPPPPPPPPPFFFFFFFPPPPPPPPZZZZZZZZZZZZZZFFFFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF 22222222222222222 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF 22222222222222222 22222222222222222222222222222222222222
\ No newline at end of file
Property changes on: trunk/data/maps/bloodprisonctf_mini.tga
___________________________________________________________________
Name: svn:mergeinfo
+
Added: trunk/data/maps/dismal_mini.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/maps/dismal_mini.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: trunk/data/maps/ons-reborn_mini.tga (from rev 4561, trunk/data/gfx/ons-reborn_mini.tga)
===================================================================
(Binary files differ)
Property changes on: trunk/data/maps/ons-reborn_mini.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:mergeinfo
+
Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc 2008-10-01 06:06:36 UTC (rev 4565)
+++ trunk/data/qcsrc/client/Main.qc 2008-10-01 07:41:23 UTC (rev 4566)
@@ -325,16 +325,20 @@
// --------------------------------------------------------------------------
// BEGIN OPTIONAL CSQC FUNCTIONS
-void Ent_ReadONS()
+void Ent_ReadEntCS()
{
entity gps;
using_gps = true;
+ InterpolateOrigin_Undo();
+
self.origin_x = ReadCoord();
self.origin_y = ReadCoord();
self.angles_y = ReadCoord();
self.origin_z = self.angles_x = self.angles_z = 0;
+ InterpolateOrigin_Note();
+
for(gps = gps_start; gps; gps = gps.chain)
{
if(gps == self)
@@ -487,7 +491,7 @@
{
switch(msg)
{
- case ENTCS_MSG_ONS_GPS: Ent_ReadONS(); break;
+ case ENTCS_MSG_ONS_GPS: Ent_ReadEntCS(); break;
case ENTCS_MSG_ONS_REMOVE: Ent_RemoveONS(); break;
default:
error("unknown ENTCS_MSG type\n");
@@ -576,7 +580,7 @@
get_mi_min_max();
mi_center = (mi_min + mi_max) * 0.5;
mi_scale = mi_max - mi_min;
- minimapname = strzone(strcat("gfx/", mi_shortname, "_mini.tga"));
+ minimapname = strzone(strcat("maps/", mi_shortname, "_mini.tga"));
shortmapname = mi_shortname;
if(gametype == GAME_ONSLAUGHT) {
Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc 2008-10-01 06:06:36 UTC (rev 4565)
+++ trunk/data/qcsrc/client/View.qc 2008-10-01 07:41:23 UTC (rev 4566)
@@ -161,6 +161,8 @@
}
}
+ current_zoomfraction = (current_viewzoom - 1) / (1/zoomfactor - 1);
+
if(zoomsensitivity < 1)
setsensitivityscale(pow(current_viewzoom, 1 - zoomsensitivity));
else
@@ -306,6 +308,8 @@
ons_view();
//drawresetcliparea();
}
+ else if(teamplay)
+ teamradar_view();
}
void Sbar_Draw();
Modified: trunk/data/qcsrc/client/main.qh
===================================================================
--- trunk/data/qcsrc/client/main.qh 2008-10-01 06:06:36 UTC (rev 4565)
+++ trunk/data/qcsrc/client/main.qh 2008-10-01 07:41:23 UTC (rev 4566)
@@ -135,3 +135,5 @@
float ready_waiting_for_me;
float vote_waiting;
float vote_waiting_for_me;
+
+float current_zoomfraction;
Modified: trunk/data/qcsrc/client/progs.src
===================================================================
--- trunk/data/qcsrc/client/progs.src 2008-10-01 06:06:36 UTC (rev 4565)
+++ trunk/data/qcsrc/client/progs.src 2008-10-01 07:41:23 UTC (rev 4566)
@@ -10,6 +10,7 @@
../common/mapinfo.qh
../common/util.qh
interpolate.qh
+teamradar.qh
main.qh
@@ -30,6 +31,7 @@
Main.qc
View.qc
interpolate.qc
+teamradar.qc
../common/util.qc
../common/gamecommand.qc
Added: trunk/data/qcsrc/client/teamradar.qc
===================================================================
--- trunk/data/qcsrc/client/teamradar.qc (rev 0)
+++ trunk/data/qcsrc/client/teamradar.qc 2008-10-01 07:41:23 UTC (rev 4566)
@@ -0,0 +1,121 @@
+float DEG2RAD = 0.01745329251994329576;
+
+float teamradar_angle; // player yaw angle
+vector teamradar_origin3d_in_texcoord; // player origin
+vector teamradar_origin2d; // 2D origin
+vector teamradar_size2d; // 2D size
+float teamradar_size; // 2D scale factor
+float teamradar_scale; // window size = ...qu
+
+vector teamradar_3dcoord_to_texcoord(vector in)
+{
+ vector out;
+ out_x = (in_x - mi_picmin_x) / (mi_picmax_x - mi_picmin_x);
+ out_y = (in_y - mi_picmin_y) / (mi_picmax_y - mi_picmin_y);
+ out_z = 0;
+ return out;
+}
+
+vector teamradar_texcoord_to_2dcoord(vector in)
+{
+ vector out;
+ in -= teamradar_origin3d_in_texcoord;
+
+ out_x = in_y * sin(teamradar_angle * DEG2RAD) + in_x * cos(teamradar_angle * DEG2RAD);
+ out_y = in_y * cos(teamradar_angle * DEG2RAD) - in_x * sin(teamradar_angle * DEG2RAD);
+ out_y = - out_y; // WHY?!? TODO find out whether the map images are mirrored too
+
+ out = out * teamradar_size;
+ out += teamradar_origin2d;
+ return out;
+}
+
+vector yinvert(vector v)
+{
+ v_y = -v_y;
+ return v;
+}
+
+void draw_teamradar_background()
+{
+ R_BeginPolygon(minimapname, 0);
+ R_PolygonVertex('1 0 0' * (teamradar_origin2d_x - teamradar_size2d_x * 0.5) + '0 1 0' * (teamradar_origin2d_y - teamradar_size2d_y * 0.5), '0 0 0', '0 0 0', 1);
+ R_PolygonVertex('1 0 0' * (teamradar_origin2d_x + teamradar_size2d_x * 0.5) + '0 1 0' * (teamradar_origin2d_y - teamradar_size2d_y * 0.5), '0 0 0', '0 0 0', 1);
+ R_PolygonVertex('1 0 0' * (teamradar_origin2d_x + teamradar_size2d_x * 0.5) + '0 1 0' * (teamradar_origin2d_y + teamradar_size2d_y * 0.5), '0 0 0', '0 0 0', 1);
+ R_PolygonVertex('1 0 0' * (teamradar_origin2d_x - teamradar_size2d_x * 0.5) + '0 1 0' * (teamradar_origin2d_y + teamradar_size2d_y * 0.5), '0 0 0', '0 0 0', 1);
+ R_EndPolygon();
+ R_BeginPolygon(minimapname, DRAWFLAG_ADDITIVE);
+ R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord0), yinvert(mi_pictexcoord0), '1 1 1', 1);
+ R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord1), yinvert(mi_pictexcoord1), '1 1 1', 1);
+ R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord2), yinvert(mi_pictexcoord2), '1 1 1', 1);
+ R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord3), yinvert(mi_pictexcoord3), '1 1 1', 1);
+ R_EndPolygon();
+}
+
+void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player =
+{
+ vector coord;
+
+ coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(coord3d));
+
+ makevectors(pangles - '0 1 0' * teamradar_angle);
+ v_forward_z = 0;
+ v_forward = normalize(v_forward);
+ v_forward_y *= -1.0;
+ v_right_x = -v_forward_y;
+ v_right_y = v_forward_x;
+
+ R_BeginPolygon("", 0);
+ R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, 1);
+ R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, 1);
+ R_PolygonVertex(coord-v_forward, '1 0 0', rgb, 1);
+ R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, 1);
+ R_EndPolygon();
+};
+
+void() teamradar_view =
+{
+ local float color;
+ local vector coord, rgb;
+ local entity tm;
+ float scale2d, normalsize, bigsize;
+
+ if(!cvar("cl_teamradar"))
+ return;
+
+ color = GetPlayerColor(player_localentnum-1);
+ rgb = GetTeamRGB(color);
+
+ scale2d = max(
+ mi_picmax_x - mi_picmin_x,
+ mi_picmax_y - mi_picmin_y
+ );
+
+ teamradar_angle = input_angles_y - 90;
+ teamradar_origin2d = '64 64 0';
+ teamradar_size2d = '128 128 0';
+ teamradar_scale = 1024;
+
+ normalsize = teamradar_size2d_x * scale2d / teamradar_scale;
+ bigsize = teamradar_size2d_x * scale2d / max(teamradar_scale, vlen(mi_min - mi_max));
+ teamradar_size =
+ current_zoomfraction * bigsize
+ + (1 - current_zoomfraction) * normalsize;
+ teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord(
+ current_zoomfraction * (mi_min + mi_max) * 0.5
+ + (1 - current_zoomfraction) * pmove_org);
+
+ drawsetcliparea(
+ teamradar_origin2d_x - teamradar_size2d_x * 0.5,
+ teamradar_origin2d_y - teamradar_size2d_y * 0.5,
+ teamradar_size2d_x,
+ teamradar_size2d_y
+ );
+
+ draw_teamradar_background();
+ draw_teamradar_player(pmove_org, input_angles, '1 1 1');
+ for(tm = gps_start; tm != world; tm = tm.chain)
+ draw_teamradar_player(tm.origin, tm.angles, rgb);
+
+ drawresetcliparea();
+};
Added: trunk/data/qcsrc/client/teamradar.qh
===================================================================
--- trunk/data/qcsrc/client/teamradar.qh (rev 0)
+++ trunk/data/qcsrc/client/teamradar.qh 2008-10-01 07:41:23 UTC (rev 4566)
@@ -0,0 +1 @@
+void teamradar_view();
Modified: trunk/data/qcsrc/common/mapinfo.qc
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qc 2008-10-01 06:06:36 UTC (rev 4565)
+++ trunk/data/qcsrc/common/mapinfo.qc 2008-10-01 07:41:23 UTC (rev 4566)
@@ -618,7 +618,7 @@
}
else if(t == "size")
{
- float a, b, c, d, e, f;
+ float a, b, c, d, e;
t = car(s); s = cdr(s); a = stof(t);
t = car(s); s = cdr(s); b = stof(t);
t = car(s); s = cdr(s); c = stof(t);
Modified: trunk/data/qcsrc/server/ent_cs.qc
===================================================================
--- trunk/data/qcsrc/server/ent_cs.qc 2008-10-01 06:06:36 UTC (rev 4565)
+++ trunk/data/qcsrc/server/ent_cs.qc 2008-10-01 07:41:23 UTC (rev 4566)
@@ -35,7 +35,7 @@
void entcs_ons(entity to)
{
if(to == self.owner || self.team != to.team ||
- self.owner.classname == "observer" || to.classname == "observer")
+ self.owner.classname == "observer" || to.classname == "observer")
{
WriteByte(MSG_ENTITY, ENTCS_MSG_ONS_REMOVE);
return;
@@ -48,36 +48,21 @@
void entcs_common_self()
{
- /*
- entity pl;
- if(self.pingtime < time)
- {
- self.pingtime = time + 9; // keep it 1 below the non-ons update intervall
- // just to be safe... (blah)
- WriteByte(MSG_ENTITY, ENTCS_MSG_PING);
- FOR_EACH_REALCLIENT(pl)
- {
- WriteByte(MSG_ENTITY, num_for_edict(pl));
- WriteShort(MSG_ENTITY, pl.ping);
- }
- WriteByte(MSG_ENTITY, 0);
- }
- */
}
float entcs_send(entity to)
{
WriteByte(MSG_ENTITY, ENT_CLIENT_ENTCS);
WriteByte(MSG_ENTITY, self.health); // serves as entitynumber
-
+
if(to == self.owner)
{
entcs_common_self();
}
-
- if(g_onslaught)
+
+ if(teams_matter)
entcs_ons(to);
-
+
WriteByte(MSG_ENTITY, ENTCS_MSG_END);
return TRUE;
};
@@ -87,10 +72,7 @@
self.team = self.owner.team;
self.Version++;
setorigin(self, self.owner.origin);
- if(game == GAME_ONSLAUGHT)
- self.nextthink = time + 0.1;
- else
- self.nextthink = time + 10; // update pings every 10 seconds
+ self.nextthink = time;
};
entity attach_entcs()
@@ -98,8 +80,6 @@
local float num;
local entity ent;
- print("Attaching ENTCS entity\n");
-
num = num_for_edict(self);
ent = get_entcs_ent();
@@ -113,7 +93,7 @@
ent.model = "entcs_sender";
ent.modelindex = 1;
setsize(ent, '0 0 0', '0 0 0');
-
+
ent.SendEntity = entcs_send;
return ent;
};
Modified: trunk/data/qcsrc/server/gamecommand.qc
===================================================================
--- trunk/data/qcsrc/server/gamecommand.qc 2008-10-01 06:06:36 UTC (rev 4565)
+++ trunk/data/qcsrc/server/gamecommand.qc 2008-10-01 07:41:23 UTC (rev 4566)
@@ -37,7 +37,7 @@
return floor(FullTraceFraction(a, mi, ma, b) / (world.maxs_z - world.mins_z) * 255);
}
#else
-float RoughMapAtPoint(float x, float y, float w, float h, vector mi_min, vector mi_max)
+float RoughMapAtPoint(float x, float y, float w, float h)
{
vector o, mi, ma;
float i, r;
@@ -103,7 +103,7 @@
fputs(f, "\"");
for(x = 0; x < m; ++x)
{
- l = RoughMapAtPoint(mi_min_x + x * w, mi_min_y + y * h, w, h, mi_picmin, mi_picmax);
+ l = RoughMapAtPoint(mi_min_x + x * w, mi_min_y + y * h, w, h);
fputs(f, substring(doublehex, 2 * l, 2));
}
if(y == 0)
Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc 2008-10-01 06:06:36 UTC (rev 4565)
+++ trunk/data/qcsrc/server/teamplay.qc 2008-10-01 07:41:23 UTC (rev 4566)
@@ -283,7 +283,6 @@
game = GAME_ONSLAUGHT;
gamemode_name = "Onslaught";
ActivateTeamplay();
- entcs_init();
}
if(g_race)
@@ -316,6 +315,9 @@
ScoreRules_race();
}
+ if(teams_matter)
+ entcs_init();
+
// save it (for the next startup)
cvar_set("gamecfg", ftos(game));
More information about the nexuiz-commits
mailing list