Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad:[8728] armagetronad/trunk/armagetronad
|
From: <baz...@us...> - 2009-01-03 23:26:00
|
Revision: 8728
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8728&view=rev
Author: bazaarmagetron
Date: 2009-01-03 23:25:49 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
da...@da...: Miscellaneous fixes to get it building again, and to get an autopackage to build out of it.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/Makefile.am
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
armagetronad/trunk/armagetronad/src/resource/tResourceType.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2009-01-03 16:28:52.592000008 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2009-01-03 17:15:50.917999983 -0600
committer: da...@da...
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-03 21:36:33 UTC (rev 8727)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-03 23:25:49 UTC (rev 8728)
@@ -86,6 +86,7 @@
tools/tFunction.h tools/tFunction.cpp\
tools/tPolynomial.h tools/tPolynomialMarshaler.h tools/tPolynomialWithBase.h \
tools/tRuby.h tools/tRuby.cpp \
+ tools/tDict.h \
resource/tResource.h resource/tResource.cpp resource/tResourceType.h resource/tResourceType.cpp
#tools/tCommandLine.cpp tools/tCommandLine.h
@@ -235,7 +236,8 @@
armagetronad_main_SOURCES = tron/gFloor.cpp tron/cockpit/cCockpit.cpp tron/cockpit/cMap.cpp
armagetronad_main_CXXFLAGS =$(libtron_a_CXXFLAGS)
-armagetronad_main_LDADD= libtron.a libenginecore.a libengine.a libnetwork.a libui.a librender.a libtools.a librubywrap.a thirdparty/mathexpr/libmathexpr.a ${extralibs}
+armagetronad_main_LDADD= libtron.a libenginecore.a libengine.a libnetwork.a libui.a librender.a libtools.a thirdparty/mathexpr/libmathexpr.a ${extralibs}
+# librubywrap.a
# armagetronad_main_LDFLAGS=
armagetronad_main_master_SOURCES = network/master.cpp
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2009-01-03 21:36:33 UTC (rev 8727)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2009-01-03 23:25:49 UTC (rev 8728)
@@ -4929,7 +4929,7 @@
lowerUser = user;
tToLower( lowerUser );
user = tOutput ( "$admin_list_authoritylevel", user );
- lowerUser = tString( "AAA" ) << lowerUser;
+ lowerUser = tColoredString((tString&)"AAA" + lowerUser);
theRightSet[ lowerUser ] = user;
authorityCount++;
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2009-01-03 21:36:33 UTC (rev 8727)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2009-01-03 23:25:49 UTC (rev 8728)
@@ -32,7 +32,7 @@
#include <boost/shared_ptr.hpp>
-#include "tDict.h"
+//#include "tDict.h"
#include "tString.h"
#include "tResourceType.h"
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceType.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceType.h 2009-01-03 21:36:33 UTC (rev 8727)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceType.h 2009-01-03 23:25:49 UTC (rev 8728)
@@ -30,6 +30,7 @@
#define ArmageTron_RESOURCETYPE_H
#include <boost/shared_ptr.hpp>
+#include <map>
#include "tString.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|