Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad:[9359] armagetronad/trunk/armagetronad
|
From: <baz...@us...> - 2010-02-05 01:09:38
|
Revision: 9359
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9359&view=rev
Author: bazaarmagetron
Date: 2010-02-05 00:20:41 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
Manuel Moos: Distinguishing between incoming synchs and new object creations. Ignore syncs for unknown objects.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/network/nNetObject.cpp
armagetronad/trunk/armagetronad/src/network/nProtoBuf.cpp
armagetronad/trunk/armagetronad/src/network/nProtoBuf.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2010-02-04 21:50:54.490999937 +0100
committer: Manuel Moos <z-...@us...>
properties:
branch-nick: armagetronad
+ timestamp: 2010-02-04 21:51:47.960000038 +0100
committer: Manuel Moos <z-...@us...>
properties:
branch-nick: armagetronad
Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs
- 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr
626 z-...@us...-20080214170110-rhfpd874zuogr3cm
627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b
657 z-...@us...-20080301093905-0jwh1zg9srukp8fn
678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a
679 z-...@us...-20080324202056-eybvkm0gjomywbcq
680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd
681 epsy-20080327213346-setzm7umdzzuk2dm
683 wrt...@us...-20080402122117-54nak33inuca02o9
684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd
685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn
686 ep...@fr...-20080418200503-q16s8az3yewn4x7a
687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3
688 wrt...@us...-20080419185850-ksm1feadrrhqigjb
689 wrt...@us...-20080423170738-zb8v72r0asm7cp52
691 ep...@fr...-20080427145818-212ave5ohdhth4ph
692 epsy46-20080428164518-07b9wsj90rf82c3y
693 epsy46-20080429194430-hq3fd6i1mnz1vrnz
694 ep...@fr...-20080518131839-uik8hj18c55boh3m
696 z-...@us...-20080618212520-e6ov1rb9b9edwt30
697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf
698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl
699 da...@da...-20080824021014-8aacq5gfp7ktxlxz
700 da...@da...-20080824055426-l5dwhb216uteu7ca
701 da...@da...-20080824172432-lvagd99j28hq8uc1
702 da...@da...-20080824225545-ply97boo9jkqtysn
704 ep...@fr...-20081027173216-nh6d92edtwe35j2g
705 ep...@fr...-20081027203505-42bpegw0fyywzyou
706 ep...@fr...-20081027204727-jcx89jukht9ay72r
707 ep...@fr...-20081028180734-62o6e90rf020xzv8
708 ep...@fr...-20081028224044-f3myemuy87v52ilp
709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq
710 ep...@fr...-20081114212232-i1q12n375bdpl0sp
712 z-...@us...-20081211141049-wbjceadupsfss5ib
713 da...@da...-20081216223143-1hso83uxyagaubg8
716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7
717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl
718 lee...@gm...-20081220085502-gpad43pu99t1e6po
719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb
720 lee...@gm...-20081220094339-k3zb139qp87r4b2w
721 lee...@gm...-20081220100858-uap7k5s22tbipzkt
722 lee...@gm...-20081220111203-rhp5p15agx73xi1k
723 lee...@gm...-20081220112757-mjp2yffddjy5s74e
724 lee...@gm...-20081220114653-k2dqt4wiizipbwas
725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6
726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw
734 lee...@gm...-20081230173103-fmzio9fanap2rybf
735 lee...@gm...-20081230174204-cppkz4sumguhysa9
736 lee...@gm...-20081230174738-mecjttlpyp1i859c
737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3
738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr
739 lee...@gm...-20081231202038-odzabc3wmlqzvskt
740 lee...@gm...-20081231203835-nn2kezh1el82dn1q
741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz
743 da...@da...-20090103170253-cdtppjz8nzwhngst
744 da...@da...-20090103183413-r1852m22og3lh2uc
745 lee...@gm...-20090103212852-mvsergjd4ao1la77
746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8
748 da...@da...-20090105115751-x3y9oui4xvt43crj
749 da...@da...-20090105131244-nljbq3qp4hp7lg07
750 da...@da...-20090105192648-inoxhljmqqe3dgw7
751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0
752 da...@da...-20090106194428-nwwwyljr8wn3pwq1
753 da...@da...-20090106194753-82zu5xfqfzbnk9k9
754 da...@da...-20090106202104-5z9836ych2di2jlo
755 da...@da...-20090106234335-aolp3kr0gasjmbri
756 da...@da...-20090106234811-p3el5s40j0upvyql
757 da...@da...-20090107021107-5kbemotp1sco4ncp
758 da...@da...-20090107051447-8ncvyikf3aadgz3a
759 da...@da...-20090107071255-jhqi9p9212levb60
760 z-...@us...-20090107105902-l6x07af4hr2py066
761 z-...@us...-20090107111842-2o0fqp72oxz55jri
762 z-...@us...-20090107113141-mo1g3b0jgzhyj001
763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e
764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1
770 z-...@us...-20090111232523-lnab7ymhxk94pdh1
771 z-...@us...-20090111232619-ukmmx5gfarcoiipi
772 z-...@us...-20090111233014-dazt93cibmg56v3i
774 z-...@us...-20090112103858-psygqhxdmdaer8iz
775 z-...@us...-20090112104018-jik2mqnc14fg5bdk
776 z-...@us...-20090112104123-hvkx0sxhs9wz706b
777 z-...@us...-20090112114514-v1u04w5v83ai75lz
778 z-...@us...-20090112115926-ltqy35euxny3n7zc
779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5
780 lee...@gm...-20090112194338-2zfak9nrxm961yh5
781 lee...@gm...-20090112194729-dlonazcnq20npwqk
782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j
783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf
784 lee...@gm...-20090112214315-r8akrgn38um8llfc
785 z-...@us...-20090115005714-uscid6wcwnjqzcht
787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym
788 z-...@us...-20090116160116-47he0b9dhkvzfo8e
789 z-...@us...-20090116160130-yu0foyldpp0w651o
794 z-...@us...-20090119152329-7zjbhlxicmzrs3st
795 z-...@us...-20090119152406-eh33pwel5c1ev3tn
796 z-...@us...-20090124222920-5j301djumy6o30js
797 lee...@gm...-20090125161331-yk5t26dos9w7vqh3
798 lee...@gm...-20090125161412-uqkzofyzrzbw5fku
799 z-...@us...-20090125215052-nlr7n742el563xdo
801 z-...@us...-20090126114408-qusodq3le7x4cxmu
802 z-...@us...-20090126114433-hel0im4ncfqun48y
805 z-...@us...-20090126205856-miq23b488w0ybg08
806 z-...@us...-20090126213956-zvazq7x917mgwgcx
807 z-...@us...-20090127091358-zyxrvmeiem90y980
808 z-...@us...-20090127091531-1nu13tf1ylwyfeu2
809 z-...@us...-20090127091641-9ejvsyc3pnqwcquk
811 z-...@us...-20090127214457-3xlqb0gqbff5fzrp
812 z-...@us...-20090127215738-ef3azdi8gyejpmod
814 z-...@us...-20090128112925-ae2c03271u9dfxhw
815 z-...@us...-20090128120342-mbnkieilhllj4p4i
816 z-...@us...-20090128120737-3ln3obsj4d6tqn2a
818 lee...@gm...-20090131032714-zj324yiwx4wni02q
819 ep...@fr...-20090125161823-9dd0qka61mwcz3c1
820 ep...@fr...-20090131143119-vb7l6bbps0mq4nz0
821 wrt...@us...-20090131191353-72oxaevmd0c43bcd
822 wrt...@us...-20090131192158-su1i1fq7a22l8m4t
823 wrt...@us...-20090131202016-24mecfpuyglq88bm
824 lee...@gm...-20090201001131-102ieca1w2tgx88j
825 lee...@gm...-20090201001411-lgn4q6qa50huba5h
826 lee...@gm...-20090201005238-sbzpnl8po5nz4p0p
827 lee...@gm...-20090201005537-esbp0iuxn2wq9ngh
830 z-...@us...-20090202133840-7iwg1phjzr3uzssl
831 lee...@gm...-20090202152533-iya7luyiiaimmann
832 ep...@fr...-20090202212943-20822j01vxylgi1c
833 lee...@gm...-20090207183547-3l0rhwd4b1cb6ksi
837 lee...@gm...-20090212204958-7qcxyvg6gg25zjaj
841 z-...@us...-20090217081732-6jpvxz8o92sti37z
842 z-...@us...-20090217100425-q62s7uu2j4h9keq4
843 z-...@us...-20090217223904-w2fk3zhgjs0s0t55
844 z-...@us...-20090217224702-zs3dd362cll5szp7
845 z-...@us...-20090219175237-ynhe2ijn23bj3824
846 z-...@us...-20090221110006-fgbl1dk4q41b7x1f
848 z-...@us...-20090223100007-f7epfrh7lfmpv5t9
849 z-...@us...-20090224115230-pgv2rxw6412ndwcx
850 z-...@us...-20090224121247-g8ycdgh9m2dn6yth
854 wrt...@us...-20090227072038-tpfjivi0uhpgrl1a
856 z-...@us...-20090227114018-torvxxmcdpf66wwu
857 z-...@us...-20090227114224-sp0ihfus7xw2fcfv
858 z-...@us...-20090227122808-o2h53nb648qvcwb3
859 z-...@us...-20090227122836-k2jjl684gaico2p1
860 z-...@us...-20090227123920-flur7p6h2g24a0hm
861 z-...@us...-20090227143152-4nay9c5k5zzmdrr3
862 lee...@gm...-20090227182603-mo7djpl31xkh38bv
863 z-...@us...-20090227201048-rin598t8m9fctjf7
864 z-...@us...-20090227201140-fnx5r434n3urmz3i
865 z-...@us...-20090227204211-qwwrnbjkx3knmbko
866 z-...@us...-20090227204603-w8nle3nyd4r5ldng
867 z-...@us...-20090227205040-xqmbjcv8nxwt9t9z
868 z-...@us...-20090227205731-2m1v554bbt2qhxes
869 z-...@us...-20090227210145-bij5hlj5x82u461d
870 z-...@us...-20090227212539-wmt09xs5wb72jal9
871 z-...@us...-20090228191447-a5kgcgxger1uktqn
872 z-...@us...-20090228210411-oxward6ey0qja0v9
873 z-...@us...-20090228214156-p1y2dx1er5f7vsgk
874 z-...@us...-20090228223607-e61qfk19bso8teht
875 lee...@gm...-20090301181643-gpq7awgxuqhvpd05
877 z-...@us...-20090302134854-ldfjzti4dhg01pe9
878 z-...@us...-20090302135448-k4x4va178wprf6bo
879 z-...@us...-20090302135554-oau4oi28bj7ww2og
880 z-...@us...-20090302150911-8o9cqnwhzy7qgkt9
883 z-...@us...-20090303113930-b80tdblbu6bqowto
885 z-...@us...-20090303145737-4u2dommtq7kmd7fa
886 z-...@us...-20090303140509-jixf06lgdd21n4xo
888 z-...@us...-20090304203702-dwk3y57pwd1fxo3m
889 z-...@us...-20090304203713-senx39tqk74p40oi
890 z-...@us...-20090304205351-xq3df8qwmydvlkq6
892 luk...@da...-20090312164834-kvceaospapwkh81n
893 luk...@da...-20090314022151-d7p9jjzt1sclslm3
894 luk...@da...-20090314022438-cz07xxgodmroz3sm
897 lee...@gm...-20090316002239-8dxi3wufl32snyf3
898 lee...@gm...-20090319004637-a2mzs3wwas2jxe2m
899 lee...@gm...-20090319004818-obe2if56wu6msdi1
900 lee...@gm...-20090319020359-w8dtx6iq1d6ldsv4
901 luk...@da...-20090319024725-ko4an74ikd4qo18o
902 z-...@us...-20090319221012-0hubn05ymf0kk15d
907 lee...@gm...-20090328200529-sthhdxb47bocgvct
908 lee...@gm...-20090401233245-890dsfl711p9rmkl
909 lee...@gm...-20090402003021-0w0o6yos48hh8n8w
911 lee...@gm...-20090412022157-gu73p9b377gysz0y
912 lee...@gm...-20090412022241-63wkndhkj0oyf3rv
914 lee...@gm...-20090420173212-vel9bvwwea1th33x
915 lee...@gm...-20090430123602-yjfa3tj0rs7tik2y
916 lee...@gm...-20090628032231-6n7nzh91y01l9foh
917 lee...@gm...-20090628151453-wmdg8a4qd5k306ss
918 lee...@gm...-20090628152206-i5y2iz9s4cskefis
919 lee...@gm...-20090701083621-jlq2bo2dni9aysoc
920 lee...@gm...-20090715070312-nfdingoq8a0scvkj
921 lee...@gm...-20090715071741-4njsy71s2r3amjhm
922 lee...@gm...-20090715234412-qsxi6pf9aov54e83
923 ep...@fr...-20090802151932-31bazpii2ffr6pu5
924 ep...@fr...-20090816173335-1y7h5ffegggokzvk
925 ep...@fr...-20090816174756-c8yyn44jcz4pfa2b
926 ep...@fr...-20090818150646-r7soc91xji1utt3f
927 z-...@us...-20090820233545-t4kmlshdrm05yl54
928 ep...@fr...-20090821173127-l9ldo3ng0fpxkmv3
929 ep...@fr...-20090822180333-ycwa5okht0jjcn2f
930 ep...@fr...-20090824131932-ohlzwoho0230xb9o
931 ep...@fr...-20090824133626-bfcnnujn7fbwgkky
932 ep...@fr...-20090824175701-r2y1dkd9bzitilax
933 ep...@fr...-20090825150538-3ljsd0qg2cy1i648
934 ep...@fr...-20090828123428-1gw6av6x2wjum92w
935 z-...@us...-20090910221850-eyrqqex3i6b65xhz
937 z-...@us...-20090922213038-qtse5qr5lwhnz1hm
938 z-...@us...-20090922214920-zoo7qhpyqqmqmxy0
939 ep...@fr...-20090924200034-5o5rw0q3y37v7zbf
940 lee...@gm...-20091011130214-zoybb7ntdl4r84gi
941 lee...@gm...-20091011132107-k2t5q2g8d9qchbhs
942 ep...@fr...-20091013181440-2l1iu5dbk16zbdk3
943 ep...@fr...-20091025160249-43xj5nyk3f4oxzdu
944 ep...@fr...-20091025164446-fh4jhoedhty1swpd
945 lee...@gm...-20091225002052-3037njugo2t2dxh3
946 lee...@gm...-20091225024251-3fpfie3mfn75r43t
947 lee...@gm...-20091225061409-wj6nxigjbu9xyqd2
948 lee...@gm...-20091225064254-qhbf9e7761elk94c
949 lee...@gm...-20100106032339-tnskmc7ll7osb4qx
950 z-...@us...-20100110163308-x950nxn2s5wzxwzf
951 z-...@us...-20100110163333-escjoogpsv3o79m4
953 z-...@us...-20100129222918-ywekc97fwfev7oy4
954 z-...@us...-20100129223545-x4fot7k5eklk69wb
955 z-...@us...-20100129223742-f0yyegj4onrgb398
956 z-...@us...-20100129231345-m5vlfynpz3pu3afp
958 z-...@us...-20100204205054-yy0o7s1q6xfn9k5r
+ 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr
626 z-...@us...-20080214170110-rhfpd874zuogr3cm
627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b
657 z-...@us...-20080301093905-0jwh1zg9srukp8fn
678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a
679 z-...@us...-20080324202056-eybvkm0gjomywbcq
680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd
681 epsy-20080327213346-setzm7umdzzuk2dm
683 wrt...@us...-20080402122117-54nak33inuca02o9
684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd
685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn
686 ep...@fr...-20080418200503-q16s8az3yewn4x7a
687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3
688 wrt...@us...-20080419185850-ksm1feadrrhqigjb
689 wrt...@us...-20080423170738-zb8v72r0asm7cp52
691 ep...@fr...-20080427145818-212ave5ohdhth4ph
692 epsy46-20080428164518-07b9wsj90rf82c3y
693 epsy46-20080429194430-hq3fd6i1mnz1vrnz
694 ep...@fr...-20080518131839-uik8hj18c55boh3m
696 z-...@us...-20080618212520-e6ov1rb9b9edwt30
697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf
698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl
699 da...@da...-20080824021014-8aacq5gfp7ktxlxz
700 da...@da...-20080824055426-l5dwhb216uteu7ca
701 da...@da...-20080824172432-lvagd99j28hq8uc1
702 da...@da...-20080824225545-ply97boo9jkqtysn
704 ep...@fr...-20081027173216-nh6d92edtwe35j2g
705 ep...@fr...-20081027203505-42bpegw0fyywzyou
706 ep...@fr...-20081027204727-jcx89jukht9ay72r
707 ep...@fr...-20081028180734-62o6e90rf020xzv8
708 ep...@fr...-20081028224044-f3myemuy87v52ilp
709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq
710 ep...@fr...-20081114212232-i1q12n375bdpl0sp
712 z-...@us...-20081211141049-wbjceadupsfss5ib
713 da...@da...-20081216223143-1hso83uxyagaubg8
716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7
717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl
718 lee...@gm...-20081220085502-gpad43pu99t1e6po
719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb
720 lee...@gm...-20081220094339-k3zb139qp87r4b2w
721 lee...@gm...-20081220100858-uap7k5s22tbipzkt
722 lee...@gm...-20081220111203-rhp5p15agx73xi1k
723 lee...@gm...-20081220112757-mjp2yffddjy5s74e
724 lee...@gm...-20081220114653-k2dqt4wiizipbwas
725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6
726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw
734 lee...@gm...-20081230173103-fmzio9fanap2rybf
735 lee...@gm...-20081230174204-cppkz4sumguhysa9
736 lee...@gm...-20081230174738-mecjttlpyp1i859c
737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3
738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr
739 lee...@gm...-20081231202038-odzabc3wmlqzvskt
740 lee...@gm...-20081231203835-nn2kezh1el82dn1q
741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz
743 da...@da...-20090103170253-cdtppjz8nzwhngst
744 da...@da...-20090103183413-r1852m22og3lh2uc
745 lee...@gm...-20090103212852-mvsergjd4ao1la77
746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8
748 da...@da...-20090105115751-x3y9oui4xvt43crj
749 da...@da...-20090105131244-nljbq3qp4hp7lg07
750 da...@da...-20090105192648-inoxhljmqqe3dgw7
751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0
752 da...@da...-20090106194428-nwwwyljr8wn3pwq1
753 da...@da...-20090106194753-82zu5xfqfzbnk9k9
754 da...@da...-20090106202104-5z9836ych2di2jlo
755 da...@da...-20090106234335-aolp3kr0gasjmbri
756 da...@da...-20090106234811-p3el5s40j0upvyql
757 da...@da...-20090107021107-5kbemotp1sco4ncp
758 da...@da...-20090107051447-8ncvyikf3aadgz3a
759 da...@da...-20090107071255-jhqi9p9212levb60
760 z-...@us...-20090107105902-l6x07af4hr2py066
761 z-...@us...-20090107111842-2o0fqp72oxz55jri
762 z-...@us...-20090107113141-mo1g3b0jgzhyj001
763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e
764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1
770 z-...@us...-20090111232523-lnab7ymhxk94pdh1
771 z-...@us...-20090111232619-ukmmx5gfarcoiipi
772 z-...@us...-20090111233014-dazt93cibmg56v3i
774 z-...@us...-20090112103858-psygqhxdmdaer8iz
775 z-...@us...-20090112104018-jik2mqnc14fg5bdk
776 z-...@us...-20090112104123-hvkx0sxhs9wz706b
777 z-...@us...-20090112114514-v1u04w5v83ai75lz
778 z-...@us...-20090112115926-ltqy35euxny3n7zc
779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5
780 lee...@gm...-20090112194338-2zfak9nrxm961yh5
781 lee...@gm...-20090112194729-dlonazcnq20npwqk
782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j
783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf
784 lee...@gm...-20090112214315-r8akrgn38um8llfc
785 z-...@us...-20090115005714-uscid6wcwnjqzcht
787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym
788 z-...@us...-20090116160116-47he0b9dhkvzfo8e
789 z-...@us...-20090116160130-yu0foyldpp0w651o
794 z-...@us...-20090119152329-7zjbhlxicmzrs3st
795 z-...@us...-20090119152406-eh33pwel5c1ev3tn
796 z-...@us...-20090124222920-5j301djumy6o30js
797 lee...@gm...-20090125161331-yk5t26dos9w7vqh3
798 lee...@gm...-20090125161412-uqkzofyzrzbw5fku
799 z-...@us...-20090125215052-nlr7n742el563xdo
801 z-...@us...-20090126114408-qusodq3le7x4cxmu
802 z-...@us...-20090126114433-hel0im4ncfqun48y
805 z-...@us...-20090126205856-miq23b488w0ybg08
806 z-...@us...-20090126213956-zvazq7x917mgwgcx
807 z-...@us...-20090127091358-zyxrvmeiem90y980
808 z-...@us...-20090127091531-1nu13tf1ylwyfeu2
809 z-...@us...-20090127091641-9ejvsyc3pnqwcquk
811 z-...@us...-20090127214457-3xlqb0gqbff5fzrp
812 z-...@us...-20090127215738-ef3azdi8gyejpmod
814 z-...@us...-20090128112925-ae2c03271u9dfxhw
815 z-...@us...-20090128120342-mbnkieilhllj4p4i
816 z-...@us...-20090128120737-3ln3obsj4d6tqn2a
818 lee...@gm...-20090131032714-zj324yiwx4wni02q
819 ep...@fr...-20090125161823-9dd0qka61mwcz3c1
820 ep...@fr...-20090131143119-vb7l6bbps0mq4nz0
821 wrt...@us...-20090131191353-72oxaevmd0c43bcd
822 wrt...@us...-20090131192158-su1i1fq7a22l8m4t
823 wrt...@us...-20090131202016-24mecfpuyglq88bm
824 lee...@gm...-20090201001131-102ieca1w2tgx88j
825 lee...@gm...-20090201001411-lgn4q6qa50huba5h
826 lee...@gm...-20090201005238-sbzpnl8po5nz4p0p
827 lee...@gm...-20090201005537-esbp0iuxn2wq9ngh
830 z-...@us...-20090202133840-7iwg1phjzr3uzssl
831 lee...@gm...-20090202152533-iya7luyiiaimmann
832 ep...@fr...-20090202212943-20822j01vxylgi1c
833 lee...@gm...-20090207183547-3l0rhwd4b1cb6ksi
837 lee...@gm...-20090212204958-7qcxyvg6gg25zjaj
841 z-...@us...-20090217081732-6jpvxz8o92sti37z
842 z-...@us...-20090217100425-q62s7uu2j4h9keq4
843 z-...@us...-20090217223904-w2fk3zhgjs0s0t55
844 z-...@us...-20090217224702-zs3dd362cll5szp7
845 z-...@us...-20090219175237-ynhe2ijn23bj3824
846 z-...@us...-20090221110006-fgbl1dk4q41b7x1f
848 z-...@us...-20090223100007-f7epfrh7lfmpv5t9
849 z-...@us...-20090224115230-pgv2rxw6412ndwcx
850 z-...@us...-20090224121247-g8ycdgh9m2dn6yth
854 wrt...@us...-20090227072038-tpfjivi0uhpgrl1a
856 z-...@us...-20090227114018-torvxxmcdpf66wwu
857 z-...@us...-20090227114224-sp0ihfus7xw2fcfv
858 z-...@us...-20090227122808-o2h53nb648qvcwb3
859 z-...@us...-20090227122836-k2jjl684gaico2p1
860 z-...@us...-20090227123920-flur7p6h2g24a0hm
861 z-...@us...-20090227143152-4nay9c5k5zzmdrr3
862 lee...@gm...-20090227182603-mo7djpl31xkh38bv
863 z-...@us...-20090227201048-rin598t8m9fctjf7
864 z-...@us...-20090227201140-fnx5r434n3urmz3i
865 z-...@us...-20090227204211-qwwrnbjkx3knmbko
866 z-...@us...-20090227204603-w8nle3nyd4r5ldng
867 z-...@us...-20090227205040-xqmbjcv8nxwt9t9z
868 z-...@us...-20090227205731-2m1v554bbt2qhxes
869 z-...@us...-20090227210145-bij5hlj5x82u461d
870 z-...@us...-20090227212539-wmt09xs5wb72jal9
871 z-...@us...-20090228191447-a5kgcgxger1uktqn
872 z-...@us...-20090228210411-oxward6ey0qja0v9
873 z-...@us...-20090228214156-p1y2dx1er5f7vsgk
874 z-...@us...-20090228223607-e61qfk19bso8teht
875 lee...@gm...-20090301181643-gpq7awgxuqhvpd05
877 z-...@us...-20090302134854-ldfjzti4dhg01pe9
878 z-...@us...-20090302135448-k4x4va178wprf6bo
879 z-...@us...-20090302135554-oau4oi28bj7ww2og
880 z-...@us...-20090302150911-8o9cqnwhzy7qgkt9
883 z-...@us...-20090303113930-b80tdblbu6bqowto
885 z-...@us...-20090303145737-4u2dommtq7kmd7fa
886 z-...@us...-20090303140509-jixf06lgdd21n4xo
888 z-...@us...-20090304203702-dwk3y57pwd1fxo3m
889 z-...@us...-20090304203713-senx39tqk74p40oi
890 z-...@us...-20090304205351-xq3df8qwmydvlkq6
892 luk...@da...-20090312164834-kvceaospapwkh81n
893 luk...@da...-20090314022151-d7p9jjzt1sclslm3
894 luk...@da...-20090314022438-cz07xxgodmroz3sm
897 lee...@gm...-20090316002239-8dxi3wufl32snyf3
898 lee...@gm...-20090319004637-a2mzs3wwas2jxe2m
899 lee...@gm...-20090319004818-obe2if56wu6msdi1
900 lee...@gm...-20090319020359-w8dtx6iq1d6ldsv4
901 luk...@da...-20090319024725-ko4an74ikd4qo18o
902 z-...@us...-20090319221012-0hubn05ymf0kk15d
907 lee...@gm...-20090328200529-sthhdxb47bocgvct
908 lee...@gm...-20090401233245-890dsfl711p9rmkl
909 lee...@gm...-20090402003021-0w0o6yos48hh8n8w
911 lee...@gm...-20090412022157-gu73p9b377gysz0y
912 lee...@gm...-20090412022241-63wkndhkj0oyf3rv
914 lee...@gm...-20090420173212-vel9bvwwea1th33x
915 lee...@gm...-20090430123602-yjfa3tj0rs7tik2y
916 lee...@gm...-20090628032231-6n7nzh91y01l9foh
917 lee...@gm...-20090628151453-wmdg8a4qd5k306ss
918 lee...@gm...-20090628152206-i5y2iz9s4cskefis
919 lee...@gm...-20090701083621-jlq2bo2dni9aysoc
920 lee...@gm...-20090715070312-nfdingoq8a0scvkj
921 lee...@gm...-20090715071741-4njsy71s2r3amjhm
922 lee...@gm...-20090715234412-qsxi6pf9aov54e83
923 ep...@fr...-20090802151932-31bazpii2ffr6pu5
924 ep...@fr...-20090816173335-1y7h5ffegggokzvk
925 ep...@fr...-20090816174756-c8yyn44jcz4pfa2b
926 ep...@fr...-20090818150646-r7soc91xji1utt3f
927 z-...@us...-20090820233545-t4kmlshdrm05yl54
928 ep...@fr...-20090821173127-l9ldo3ng0fpxkmv3
929 ep...@fr...-20090822180333-ycwa5okht0jjcn2f
930 ep...@fr...-20090824131932-ohlzwoho0230xb9o
931 ep...@fr...-20090824133626-bfcnnujn7fbwgkky
932 ep...@fr...-20090824175701-r2y1dkd9bzitilax
933 ep...@fr...-20090825150538-3ljsd0qg2cy1i648
934 ep...@fr...-20090828123428-1gw6av6x2wjum92w
935 z-...@us...-20090910221850-eyrqqex3i6b65xhz
937 z-...@us...-20090922213038-qtse5qr5lwhnz1hm
938 z-...@us...-20090922214920-zoo7qhpyqqmqmxy0
939 ep...@fr...-20090924200034-5o5rw0q3y37v7zbf
940 lee...@gm...-20091011130214-zoybb7ntdl4r84gi
941 lee...@gm...-20091011132107-k2t5q2g8d9qchbhs
942 ep...@fr...-20091013181440-2l1iu5dbk16zbdk3
943 ep...@fr...-20091025160249-43xj5nyk3f4oxzdu
944 ep...@fr...-20091025164446-fh4jhoedhty1swpd
945 lee...@gm...-20091225002052-3037njugo2t2dxh3
946 lee...@gm...-20091225024251-3fpfie3mfn75r43t
947 lee...@gm...-20091225061409-wj6nxigjbu9xyqd2
948 lee...@gm...-20091225064254-qhbf9e7761elk94c
949 lee...@gm...-20100106032339-tnskmc7ll7osb4qx
950 z-...@us...-20100110163308-x950nxn2s5wzxwzf
951 z-...@us...-20100110163333-escjoogpsv3o79m4
953 z-...@us...-20100129222918-ywekc97fwfev7oy4
954 z-...@us...-20100129223545-x4fot7k5eklk69wb
955 z-...@us...-20100129223742-f0yyegj4onrgb398
956 z-...@us...-20100129231345-m5vlfynpz3pu3afp
958 z-...@us...-20100204205054-yy0o7s1q6xfn9k5r
959 z-...@us...-20100204205147-4e0wda7jksycebj8
Modified: armagetronad/trunk/armagetronad/src/network/nNetObject.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nNetObject.cpp 2010-02-05 00:18:00 UTC (rev 9358)
+++ armagetronad/trunk/armagetronad/src/network/nNetObject.cpp 2010-02-05 00:20:41 UTC (rev 9359)
@@ -50,7 +50,7 @@
// debug watchs
#ifdef DEBUG
-int sn_WatchNetID = 0;
+int sn_WatchNetID = -1;
extern nMessageBase* sn_WatchMessage;
#endif
@@ -81,7 +81,7 @@
#ifdef DEBUG
static void sn_BreakOnObjectID( unsigned short id )
{
-#ifdef DEBUG_X
+#ifdef DEBUG
static unsigned int breakOnID = sn_WatchNetID;
static REAL minTime = 0;
if ( id == breakOnID && tSysTimeFloat() > minTime )
@@ -2226,6 +2226,9 @@
createdLocally = false;
+ tASSERT(sync.has_object_id());
+ tASSERT(sync.has_owner_id());
+
registrar.id = sync.object_id();
#ifdef DEBUG
//con << "Netobject " << id << " created on remote order.\n";
Modified: armagetronad/trunk/armagetronad/src/network/nProtoBuf.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nProtoBuf.cpp 2010-02-05 00:18:00 UTC (rev 9358)
+++ armagetronad/trunk/armagetronad/src/network/nProtoBuf.cpp 2010-02-05 00:20:41 UTC (rev 9359)
@@ -1101,6 +1101,11 @@
nNetObjectDescriptorBase::~nNetObjectDescriptorBase()
{}
+Network::NetObjectSync const & nNetObjectDescriptorBase::GetNetObjectSync ( Network::NetObjectSync const & message )
+{
+ return message;
+}
+
unsigned int nNetObjectDescriptorBase::GetObjectID ( Network::NetObjectSync const & message )
{
if( !message.has_object_id() )
@@ -1112,10 +1117,17 @@
//! checks to run before creating a new object
//! @return true if all is OK
-bool nNetObjectDescriptorBase::PreCheck( unsigned short id, nSenderInfo sender )
+bool nNetObjectDescriptorBase::PreCheck( Network::NetObjectSync const & sync, nSenderInfo sender )
{
+ unsigned short id = GetObjectID( sync );
nNetObject::ClearDeleted(id);
+ // reject sync messages for nonexistent objects
+ if( !sync.has_owner_id() && !bool(sn_netObjects[id]) )
+ {
+ return false;
+ }
+
if (sn_netObjectsOwner[id]!=sender.SenderID() || bool(sn_netObjects[id]))
{
#ifdef DEBUG
Modified: armagetronad/trunk/armagetronad/src/network/nProtoBuf.h
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nProtoBuf.h 2010-02-05 00:18:00 UTC (rev 9358)
+++ armagetronad/trunk/armagetronad/src/network/nProtoBuf.h 2010-02-05 00:20:41 UTC (rev 9359)
@@ -482,18 +482,27 @@
static nMessageStreamer * SyncStreamer();
protected:
+ // fetches the network object part from a creation/sync message
+ template< class PROTOBUF >
+ static Network::NetObjectSync const & GetNetObjectSync( PROTOBUF const & message )
+ {
+ tASSERT( message.has_base() );
+ return GetNetObjectSync( message.base() );
+ }
+
+ static Network::NetObjectSync const & GetNetObjectSync ( Network::NetObjectSync const & message );
+
// fetches the network object ID from a creation message
template< class PROTOBUF >
static unsigned int GetObjectID( PROTOBUF const & message )
{
- tASSERT( message.has_base() );
- return GetObjectID( message.base() );
+ return GetObjectID( GetNetObjectSync( message ) );
}
- static unsigned int GetObjectID ( Network::NetObjectSync const & message );
+ static unsigned int GetObjectID( Network::NetObjectSync const & message );
//! checks to run before creating a new object
- static bool PreCheck( unsigned short id, nSenderInfo sender );
+ static bool PreCheck( Network::NetObjectSync const & sync, nSenderInfo sender );
//! checks to run after creating a new object
static void PostCheck( nNetObject * object, nSenderInfo sender );
@@ -751,9 +760,7 @@
static void HandleCreation( PROTOBUF const & message, nSenderInfo const & sender )
{
- unsigned short id = GetObjectID( message );
-
- if( PreCheck( id, sender ) )
+ if( PreCheck( GetNetObjectSync( message ), sender ) )
{
nNetObjectRegistrar registrar;
tJUST_CONTROLLED_PTR< OBJECT > n=tNEW(OBJECT)( message, sender );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|