Menu
▾
▴
armagetronad-commits
|
From: <baz...@us...> - 2008-07-27 18:14:42
|
Revision: 8507
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8507&view=rev
Author: bazaarmagetron
Date: 2008-07-27 18:14:51 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Fixed bug where current_pos_y would report the x coordinate in a cockpit file. Thank Pathetique for reporting it.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-07-08 16:23:00.000000000 +0200
committer: wrtlprnft <wrt...@us...>
properties:
branch-nick: trunk-armagetronad-work
bugs: https://launchpad.net/bugs/246159 fixed
+ timestamp: 2008-07-27 19:33:10.890000105 +0200
committer: wrtlprnft <wrt...@us...>
properties:
branch-nick: trunk-armagetronad-work
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.cpp 2008-07-24 11:42:07 UTC (rev 8506)
+++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.cpp 2008-07-27 18:14:51 UTC (rev 8507)
@@ -410,7 +410,7 @@
tValue::BasePtr cCockpit::cb_CurrentPosY(void) {
if(m_Type == VIEWPORT_TOP) return tValue::BasePtr(new tValue::Base());
- return tValue::BasePtr(new tValue::Float(m_FocusCycle->Position().x));
+ return tValue::BasePtr(new tValue::Float(m_FocusCycle->Position().y));
}
cCockpit* cCockpit::_instance = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-08-24 02:49:43
|
Revision: 8522
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8522&view=rev
Author: bazaarmagetron
Date: 2008-08-24 02:49:51 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
Dave Fancella: Factored tResource and tResourceManager into their own places
Modified Paths:
--------------
armagetronad/trunk/armagetronad/music/default.m3u
armagetronad/trunk/armagetronad/resource/proto/AATeam/lucifer-0.0.1.aacockpit.xml
armagetronad/trunk/armagetronad/src/Makefile.am
armagetronad/trunk/armagetronad/src/tools/tXmlParser.cpp
armagetronad/trunk/armagetronad/src/tools/tXmlParser.h
armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.h
armagetronad/trunk/armagetronad/src/tron/gParser.h
Added Paths:
-----------
armagetronad/trunk/armagetronad/src/resource/
armagetronad/trunk/armagetronad/src/resource/tResource.cpp
armagetronad/trunk/armagetronad/src/resource/tResource.h
armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp
armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
Removed Paths:
-------------
armagetronad/trunk/armagetronad/src/tools/tResource.cpp
armagetronad/trunk/armagetronad/src/tools/tResource.h
armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp
armagetronad/trunk/armagetronad/src/tools/tResourceManager.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-07-27 19:33:10.890000105 +0200
committer: wrtlprnft <wrt...@us...>
properties:
branch-nick: trunk-armagetronad-work
+ timestamp: 2008-08-23 21:10:14.457000017 -0500
committer: Dave Fancella <da...@da...>
properties:
branch-nick: trunk
Modified: bzr:file-ids
-
+ src/resource srcresource-20080823193337-xmrk7wrw1l3ud1f2-1
src/resource/tResource.h 6218@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftools%2FtResource.h
src/resource/tResourceManager.cpp 4612@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftools%2FtResourceManager.cpp
src/resource/tResource.cpp 6218@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftools%2FtResource.cpp
src/resource/tResourceManager.h 4612@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftools%2FtResourceManager.h
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
+ 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
Modified: armagetronad/trunk/armagetronad/music/default.m3u
===================================================================
--- armagetronad/trunk/armagetronad/music/default.m3u 2008-08-23 19:19:21 UTC (rev 8521)
+++ armagetronad/trunk/armagetronad/music/default.m3u 2008-08-24 02:49:51 UTC (rev 8522)
@@ -1,4 +1,7 @@
-#music/when.ogg
-#music/fortresswalk.ogg
-#music/doIknowyou.ogg
-music/fortresswalk.aatrack
\ No newline at end of file
+music/RMA11.ogg
+music/RMA12.ogg
+music/RMA13.ogg
+music/RMA14.ogg
+music/RMA15.ogg
+music/RMA18.ogg
+music/RMA19.ogg
Modified: armagetronad/trunk/armagetronad/resource/proto/AATeam/lucifer-0.0.1.aacockpit.xml
===================================================================
--- armagetronad/trunk/armagetronad/resource/proto/AATeam/lucifer-0.0.1.aacockpit.xml 2008-08-23 19:19:21 UTC (rev 8521)
+++ armagetronad/trunk/armagetronad/resource/proto/AATeam/lucifer-0.0.1.aacockpit.xml 2008-08-24 02:49:51 UTC (rev 8522)
@@ -1,10 +1,41 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<!DOCTYPE Resource SYSTEM "cockpit.dtd">
-<Resource type="aacockpit" name="Playroom" version="0.0.1" author="Lucifer" category="sick">
+<Resource type="aacockpit" name="Playroom" version="0.0.2" author="Lucifer" category="sick">
<Cockpit version="0.0.1">
- <!-- speed meter -->
- <BarGauge camera="*">
+ <WidgetTemplate id="VerticalBar">
+ <Size height="0.150" width="0.010" />
+ <Background>
+ <Gradient orientation="value">
+ <Color r="0." g="1." b="0." alpha=".05" at="0."/>
+ <Color r="0." g="1." b="0." alpha=".1" at=".3"/>
+ <Color r="1." g="1." b="1." alpha=".2" at=".4"/>
+ <Color r="1." g="1." b="1." alpha=".2" at="1."/>
+ </Gradient>
+ </Background>
+ <Foreground>
+ <Gradient orientation="value">
+ <Color r="0." g="1." b="0." alpha=".4" at="0."/>
+ <Color r="0." g="1." b="0." alpha=".4" at=".3"/>
+ <Color r="1." g="1." b="0." alpha=".4" at=".6"/>
+ <Color r="1." g="0." b="0." alpha=".4" at=".8"/>
+ <Color r="1." g="0." b="0." alpha=".4" at="1."/>
+ </Gradient>
+ </Foreground>
+ </WidgetTemplate>
+ <WidgetTemplate id="Clock">
+ <Position x=".6" y="-.9" />
+ <Size height="0.075" width="0.075" />
+ <Foreground>
+ <Solid>
+ <Color r="1." g="1." b="1." alpha="1." />
+ </Solid>
+ </Foreground>
+ <ShowCurrent value="false" />
+ <ShowMaximum value="false" />
+ <ShowMinimum value="false" />
+ </WidgetTemplate>
+ <BarGauge camera="^in">
<DataSet>
<AtomicData field="source" source="player_speed" />
<AtomicData field="minimum" source="0" />
@@ -30,7 +61,7 @@
</Foreground>
</BarGauge>
<!--- Acceleration meter -->
- <BarGauge camera="*">
+ <BarGauge camera="^in">
<DataSet>
<AtomicData field="source" source="player_acceleration" />
<AtomicData field="minimum" source="-50" />
@@ -51,7 +82,7 @@
</Background>
</BarGauge>
<!-- Brakes -->
- <BarGauge camera="*">
+ <BarGauge camera="^in">
<DataSet>
<AtomicData field="source" source="player_brakes" />
<AtomicData field="minimum" source="0" />
@@ -79,7 +110,7 @@
</BarGauge>
<!-- Enemies alive -->
- <Label camera="*">
+ <Label camera="^in">
<DataSet id="enemies">
<AtomicData field="source" source="enemies_alive" />
</DataSet>
@@ -201,7 +232,7 @@
</Face>
</Label> -->
<!-- Clock -->
- <Label camera="*" viewport="top">
+ <Label camera="^in">
<DataSet id="hours">
<AtomicData source="current_hours12h" minwidth="2" fill="0" />
</DataSet>
@@ -232,7 +263,7 @@
</Face>
</Label>
<!-- FPS -->
- <BarGauge camera="*" viewport="top">
+ <BarGauge camera="^in">
<DataSet>
<AtomicData field="source" source="current_framerate" />
<AtomicData field="minimum" source="0" />
@@ -256,14 +287,273 @@
</BarGauge>
<!-- HUD Map (obviously) -->
- <Map camera="*">
+ <Map camera="^in">
<Position x="0" y="-0.759" />
<Size height="0.24" width="0.24" />
<Background>
+ <Image scale_x=".075" scale_y=".075" repeat="both">
+ <Graphic author="wrtlprnft" version="1" name="floor" extension="png" uri="http://wrtlprnft.ath.cx/floor.png" />
+ </Image>
<Solid>
- <Color r="1." g="1." b="1." alpha=".2" />
+ <Color r=".5" g="1." b=".5" alpha="1." />
</Solid>
</Background>
+ <MapModes toggleKey="1">
+ <MapMode mode="cycle" rotation="camera" zoomFactor="4" clipMode="ellipse" />
+ </MapModes>
+ <MapModes toggleKey="2">
+ <MapMode mode="cycle" rotation="camera" zoomFactor="2" clipMode="ellipse" />
+ </MapModes>
+ <MapModes toggleKey="3">
+ <MapMode mode="full" rotation="spawn" />
+ </MapModes>
+ <MapModes toggleKey="4">
+ <MapMode mode="closestZone" rotation="fixed" />
+ </MapModes>
</Map>
+ <!-- Here follows the incam cockpit, which is different than the rest -->
+ <!-- Just a background for the cockpit as a whole -->
+ <Rectangle camera="in">
+ <Position x="0" y="0"/>
+ <Size height="1" width="1"/>
+ <Background>
+ <Image scale_x="1" scale_y="1">
+ <Graphic category="sick" author="Lucifer" version="1" name="playroom" extension="png" />
+ </Image>
+ </Background>
+ </Rectangle>
+ <!-- speed meter -->
+ <VerticalBarGauge camera="in" usetemplate="VerticalBar">
+ <DataSet>
+ <AtomicData field="source" source="player_speed" />
+ <AtomicData field="minimum" source="0" />
+ <AtomicData field="maximum" source="80" />
+ </DataSet>
+ <Position x="0.3" y="-0.7" />
+ <ShowCurrent value="false" />
+ <ShowMaximum value="false" />
+ <ShowMinimum value="false" />
+ <Caption location="bottom">
+ <Text value="S" />
+ </Caption>
+ <Background>
+ <Solid>
+ <Color r="0.1" g="0.3" b="0.2" alpha="0.2" />
+ </Solid>
+ </Background>
+ <Foreground>
+ <Solid>
+ <Color r="1." g="0." b="0." alpha="1." />
+ </Solid>
+ </Foreground>
+ </VerticalBarGauge>
+ <!-- Brakes -->
+ <VerticalBarGauge camera="in" usetemplate="VerticalBar">
+ <DataSet>
+ <AtomicData field="source" source="player_brakes" />
+ <AtomicData field="minimum" source="0" />
+ <AtomicData field="maximum" source="1" />
+ </DataSet>
+ <Position x="0.33" y="-0.7" />
+ <ShowCurrent value="false" />
+ <ShowMaximum value="false" />
+ <ShowMinimum value="false" />
+ <Caption location="bottom">
+ <Text value="B" />
+ </Caption>
+ </VerticalBarGauge>
+ <!-- Rubber -->
+ <VerticalBarGauge camera="in" usetemplate="VerticalBar">
+ <DataSet>
+ <AtomicData field="source" source="player_rubber" />
+ <AtomicData field="minimum" source="0" />
+ <AtomicData field="maximum" source="cycle_rubber" />
+ </DataSet>
+ <Position x="0.27" y="-0.7" />
+ <ShowCurrent value="false" />
+ <ShowMaximum value="false" />
+ <ShowMinimum value="false" />
+ <Caption location="bottom">
+ <Text value="R" />
+ </Caption>
+ </VerticalBarGauge>
+ <Rectangle camera="in">
+ <Position x="0.27" y="-0.7"/>
+ <Size height="0.150" width="0.013" />
+ <Background>
+ <Image scale_x="1" scale_y=".2">
+ <Graphic category="sick" author="Lucifer" version="1" name="bubblewindow" extension="png" />
+ </Image>
+ </Background>
+ </Rectangle>
+ <Rectangle camera="in">
+ <Position x="0.3" y="-0.7"/>
+ <Size height="0.150" width="0.013" />
+ <Background>
+ <Image scale_x="1" scale_y=".2">
+ <Graphic category="sick" author="Lucifer" version="1" name="bubblewindow" extension="png" />
+ </Image>
+ </Background>
+ </Rectangle>
+ <Rectangle camera="in">
+ <Position x="0.33" y="-0.7"/>
+ <Size height="0.150" width="0.013" />
+ <Background>
+ <Image scale_x="1" scale_y=".2">
+ <Graphic category="sick" author="Lucifer" version="1" name="bubblewindow" extension="png" />
+ </Image>
+ </Background>
+ </Rectangle>
+
+ <!-- Enemies alive -->
+ <VerticalBarGauge camera="in" usetemplate="VerticalBar">
+ <DataSet id="enemies">
+ <AtomicData field="source" source="enemies_alive" />
+ <AtomicData field="minimum" source="0" />
+ <AtomicData field="maximum" source="10" />
+ </DataSet>
+ <ShowCurrent value="true" />
+ <ShowMaximum value="false" />
+ <ShowMinimum value="false" />
+ <Position x="-0.26" y="-0.7" />
+ <Caption location="bottom">
+ <Text value="E" />
+ </Caption>
+ <Foreground>
+ <Solid>
+ <Color r="1.0" g="0.0" b="0.0" alpha="1.0" />
+ </Solid>
+ </Foreground>
+ </VerticalBarGauge>
+ <!-- Friends alive -->
+ <VerticalBarGauge camera="in" usetemplate="VerticalBar">
+ <DataSet id="friends">
+ <AtomicData field="source" source="friends_alive" />
+ <AtomicData field="minimum" source="0" />
+ <AtomicData field="maximum" source="10" />
+ </DataSet>
+ <ShowCurrent value="true" />
+ <ShowMaximum value="false" />
+ <ShowMinimum value="false" />
+ <Position x="-0.29" y="-0.7" />
+ <Caption location="bottom">
+ <Text value="F" />
+ </Caption>
+ <Foreground>
+ <Solid>
+ <Color r="0.0" g="1.0" b="0.0" alpha="1.0" />
+ </Solid>
+ </Foreground>
+ </VerticalBarGauge>
+ <Rectangle camera="in">
+ <Position x="-0.29" y="-0.7"/>
+ <Size height="0.150" width="0.013" />
+ <Background>
+ <Image scale_x="1" scale_y="1.0">
+ <Graphic category="sick" author="Lucifer" version="1" name="bubblewindow" extension="png" />
+ </Image>
+ </Background>
+ </Rectangle>
+ <Rectangle camera="in">
+ <Position x="-0.26" y="-0.7"/>
+ <Size height="0.150" width="0.013" />
+ <Background>
+ <Image scale_x="1" scale_y="1.0">
+ <Graphic category="sick" author="Lucifer" version="1" name="bubblewindow" extension="png" />
+ </Image>
+ </Background>
+ </Rectangle>
+ <!-- FPS -->
+ <BarGauge camera="in" viewport="top">
+ <DataSet>
+ <AtomicData field="source" source="current_framerate" />
+ <AtomicData field="minimum" source="0" />
+ <AtomicData field="maximum" source="100" />
+ </DataSet>
+ <Position x="0" y="0.45" />
+ <Size height="0.03" width="0.08" />
+ <ShowCurrent value="true" />
+ <ShowMaximum value="true" />
+ <ShowMinimum value="true" />
+ <Background>
+ <Solid>
+ <Color r="0." g="1." b="0." alpha="1." />
+ </Solid>
+ </Background>
+ <Foreground>
+ <Solid>
+ <Color r="1." g="0." b="0." alpha="1." />
+ </Solid>
+ </Foreground>
+ </BarGauge>
+
+ <Rectangle camera="in" usetemplate="Clock">
+ <Size height="1" width="1" />
+ <Background>
+ <Image>
+ <Graphic author="wrtlprnft" version="1" name="benboisclock" uri="http://wrtlprnft.ath.cx/benboisclock.png" />
+ </Image>
+ <Solid>
+ <Color r="1." g="1." b="1." alpha=".8" />
+ </Solid>
+ </Background>
+ </Rectangle>
+ <NeedleGauge camera="in" usetemplate="Clock">
+ <DataSet>
+ <AtomicData field="source" source="current_seconds" />
+ <AtomicData field="minimum" source="0" />
+ <AtomicData field="maximum" source="60" />
+ </DataSet>
+ <Angles min="-270" max="90" />
+ <Size height="0.75" width="0.75" />
+ </NeedleGauge>
+ <NeedleGauge camera="in" usetemplate="Clock">
+ <DataSet>
+ <Math lvalue="current_minutes" type="sum" field="source">
+ <RValue>
+ <Math rvalue="0.01666666" type="product" lvalue="current_seconds" />
+ </RValue>
+ </Math>
+ <AtomicData field="minimum" source="0" />
+ <AtomicData field="maximum" source="60" />
+ </DataSet>
+ <Angles min="-270" max="90" />
+ <Size height="0.75" width="0.75" />
+ </NeedleGauge>
+ <NeedleGauge camera="in" usetemplate="Clock">
+ <DataSet>
+ <Math lvalue="current_hours12h" type="sum" field="source">
+ <RValue>
+ <Math rvalue="0.01666666" type="product" lvalue="current_minutes" />
+ </RValue>
+ </Math>
+ <AtomicData field="minimum" source="1" />
+ <AtomicData field="maximum" source="13" />
+ </DataSet>
+ <Angles min="-240" max="120" />
+ <Size height="0.5" width="0.5" />
+ </NeedleGauge>
+ <!-- HUD Map (obviously) -->
+ <Map camera="in">
+ <Position x="0" y="-0.759" />
+ <Size height="0.24" width="0.24" />
+ <Background>
+ <Image scale_x=".075" scale_y=".075" repeat="both">
+ <Graphic author="wrtlprnft" version="1" name="floor" extension="png" uri="http://wrtlprnft.ath.cx/floor.png" />
+ </Image>
+ <Solid>
+ <Color r=".5" g="1." b=".5" alpha="1." />
+ </Solid>
+ </Background>
+ <MapModes toggleKey="1">
+ <MapMode mode="full" rotation="spawn" />
+ <MapMode mode="closestZone" rotation="fixed" />
+ </MapModes>
+ <MapModes toggleKey="2">
+ <MapMode mode="cycle" rotation="camera" zoomFactor="3" clipMode="ellipse" />
+ <MapMode mode="cycle" rotation="cycle" zoomFactor="3" clipMode="ellipse" />
+ <MapMode mode="cycle" rotation="spawn" zoomFactor="4" clipMode="ellipse" />
+ </MapModes>
+ </Map>
</Cockpit>
</Resource>
Modified: armagetronad/trunk/armagetronad/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2008-08-23 19:19:21 UTC (rev 8521)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2008-08-24 02:49:51 UTC (rev 8522)
@@ -44,7 +44,7 @@
# library file listings
if BUILDMAIN
-tools_extra=tools/tResourceManager.cpp tools/tResourceManager.h
+tools_extra=resource/tResourceManager.cpp resource/tResourceManager.h
else
tools_extra=
endif
@@ -52,7 +52,7 @@
# Note: tMemManager.cpp must be last to avoid false leak reports (sorry for
# the fragile dependency on undefined behaviour of the linker...)
-libtools_a_SOURCES= ${tools_extra} tools/tArray.cpp tools/tArray.h tools/tCallback.cpp tools/tCallback.h tools/tCallbackString.h tools/tColor.cpp tools/tColor.h\
+libtools_a_SOURCES = ${tools_extra} tools/tArray.cpp tools/tArray.h tools/tCallback.cpp tools/tCallback.h tools/tCallbackString.h tools/tColor.cpp tools/tColor.h\
tools/tConfiguration.cpp tools/tConfiguration.h tools/tConsole.cpp tools/tConsole.h tools/tCrypt.cpp tools/tCrypt.h\
tools/tDirectories.cpp tools/tDirectories.h tools/tError.cpp tools/tError.h tools/tEventQueue.cpp\
tools/tEventQueue.h tools/tHeap.cpp tools/tHeap.h tools/tInitExit.h tools/tLinkedList.cpp tools/tLinkedList.h\
@@ -88,8 +88,8 @@
tools/tValue.h tools/tValueParser.h\
tools/tFunction.h tools/tFunction.cpp\
tools/tPolynomial.h tools/tPolynomialMarshaler.h tools/tPolynomialWithBase.h \
- tools/tResource.h tools/tResource.cpp \
- tools/tRuby.h tools/tRuby.cpp
+ tools/tRuby.h tools/tRuby.cpp \
+ resource/tResource.h resource/tResource.cpp
#tools/tCommandLine.cpp tools/tCommandLine.h
libnetwork_a_SOURCES=network/md5.cpp network/md5.h network/nAuthentication.cpp\
@@ -177,7 +177,7 @@
#AM_CXXFLAGS= $(BINRELOC_CFLAGS)
-libtools_a_CXXFLAGS =$(AM_CXXFLAGS) -I@srcdir@/tools -I@srcdir@/thirdparty/mathexpr
+libtools_a_CXXFLAGS =$(AM_CXXFLAGS) -I@srcdir@/tools -I@srcdir@/resource -I@srcdir@/thirdparty/mathexpr
libnetwork_a_CXXFLAGS=$(libtools_a_CXXFLAGS) -I@srcdir@/network
librender_a_CXXFLAGS =$(libtools_a_CXXFLAGS) -I@srcdir@/render
libui_a_CXXFLAGS =$(librender_a_CXXFLAGS) -I@srcdir@/ui -I@srcdir@/thirdparty/shttpd -I@srcdir@/thirdparty/scrap
Copied: armagetronad/trunk/armagetronad/src/resource/tResource.cpp (from rev 8507, armagetronad/trunk/armagetronad/src/tools/tResource.cpp)
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResource.cpp (rev 0)
+++ armagetronad/trunk/armagetronad/src/resource/tResource.cpp 2008-08-24 02:49:51 UTC (rev 8522)
@@ -0,0 +1,89 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2005 by
+and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+***************************************************************************
+
+*/
+
+#include "tResource.h"
+
+bool tResource::LoadFile(const char* filename, const char* uri) {
+ m_Filename = tResourceManager::locateResource(filename, uri);
+ return LoadXmlFile(m_Filename, uri);
+}
+
+bool tResource::ValidateXml(FILE* docfd, const char* uri, const char* filepath) {
+ bool validated = tXmlParser::ValidateXml(docfd, uri, filepath);
+
+ /* check filepath */
+ if ( validated && filepath )
+ {
+ node root = GetRoot();
+
+ if (!root) {
+ con << "Empty document\n";
+ return false;
+ } else if (root.IsOfType("Resource")) {
+ m_Path = tResourcePath (
+ root.GetProp("author"),
+ root.GetProp("category"),
+ root.GetProp("name"),
+ root.GetProp("version"),
+ root.GetProp("type"),
+ tString("xml"),
+ tString("")
+ );
+ tString rightFilepath( m_Path.Path() );
+ tString pureFilepath( filepath );
+ int pos;
+ while((pos = pureFilepath.StrPos("//")) != -1) {
+ pureFilepath.RemoveSubStr(pos, 1);
+ }
+ tResourcePath purepath(pureFilepath);
+ if ( purepath != m_Path )
+ {
+ con << "\nWARNING: incorrect filepath. The resource wants to be at \"" << rightFilepath << "\", but was loaded from \"" << filepath << "\".\n\n";
+ }
+ }
+ else {
+ con << "Root node is not of type 'Resource' but '" << root.GetName() << "'.\n";
+ return false;
+ }
+ }
+
+ return validated;
+}
+
+tXmlParser::node tResource::GetFileContents(void) {
+ for(node cur = GetRoot().GetFirstChild(); cur; ++cur) {
+ if(!cur.IsOfType("comment") && !cur.IsOfType("text")) {
+ return cur;
+ }
+ }
+ return 0;
+}
+
+
+
+
Copied: armagetronad/trunk/armagetronad/src/resource/tResource.h (from rev 8507, armagetronad/trunk/armagetronad/src/tools/tResource.h)
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResource.h (rev 0)
+++ armagetronad/trunk/armagetronad/src/resource/tResource.h 2008-08-24 02:49:51 UTC (rev 8522)
@@ -0,0 +1,49 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2005 by
+and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+***************************************************************************
+
+*/
+
+#ifndef ArmageTron_TRESOURCE_H
+#define ArmageTron_TRESOURCE_H
+
+#include "tXmlParser.h"
+
+#include "tResourceManager.h"
+
+class tResource : public tXmlParser {
+public:
+ bool LoadFile(const char* filename, const char* uri="");
+ tResourcePath const &Path() const {return m_Path;} //!< get the resource path this file was loaded from
+protected:
+ bool ValidateXml(FILE* docfd, const char* uri, const char* filepath);
+ tResourcePath m_Path; //!< the resource identifier of this resource
+ node GetFileContents(void); //!< Returns the node the "real" file contents are within
+};
+
+//! \deprecated
+typedef tResource tXmlResource;
+
+#endif
Copied: armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp (from rev 8507, armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp)
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp (rev 0)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp 2008-08-24 02:49:51 UTC (rev 8522)
@@ -0,0 +1,410 @@
+#include "aa_config.h"
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <libxml/nanohttp.h>
+
+#include "tConfiguration.h"
+#include "tDirectories.h"
+#include "tResourceManager.h"
+#include "tString.h"
+
+// This is a little ugly, open to suggestions :)
+tResourceManager::Reference tResourceManager::__inst = tResourceManager::Reference(new tResourceManager() );
+
+tResourceManager::tResourceManager() {
+ // stub constructor for now
+}
+
+tResourceManager::~tResourceManager() { }
+
+tResourceManager::Reference tResourceManager::GetResourceManager() {
+ if(!__inst) {
+ __inst = Reference(new tResourceManager() );
+ }
+
+ return Reference(__inst);
+}
+
+void tResourceManager::RegisterLoader()
+{
+}
+
+tResource* tResourceManager::GetResource(const char *file, int typeID)
+{
+ // stub
+ return NULL;
+}
+
+int tResourceManager::RegisterResourceType(tNewResourceFunc func) {
+ // stub
+ return 0;
+}
+
+//tResource* GetResource(const char *file, int typeID) {
+// // stub
+//}
+
+// server determined resource repository
+tString & tResourceManager::AccessRepoServer()
+{
+ static tString resRepoServer("http://resource.armagetronad.net/resource/");
+ return resRepoServer;
+}
+// the nSettingItem is in gStuff.cpp
+
+// client determined resource repository
+tString & tResourceManager::AccessRepoClient()
+{
+ static tString resRepoClient("http://resource.armagetronad.net/resource/");
+ return resRepoClient;
+}
+
+static tSettingItem<tString> conf_res_repo("RESOURCE_REPOSITORY_CLIENT", tResourceManager::AccessRepoClient());
+
+static int myHTTPFetch(const char *URI, const char *filename, const char *savepath)
+{
+ void *ctxt = NULL;
+ char *buf = NULL;
+ FILE* fd;
+ int len, rc;
+
+ con << tOutput( "$resource_downloading", URI );
+ // con << "Downloading " << URI << "...\n";
+
+ ctxt = xmlNanoHTTPOpen(URI, NULL);
+ if (ctxt == NULL) {
+ con << "ERROR: ctxt is NULL\n";
+ return 1;
+ }
+
+ if ( (rc = xmlNanoHTTPReturnCode(ctxt)) != 200 ) {
+ con << tOutput( rc == 404 ? "$resource_fetcherror_404" : "$resource_fetcherror", rc );
+ return 2;
+ }
+
+ fd = fopen(savepath, "wb");
+ if (fd < 0) {
+ xmlNanoHTTPClose(ctxt);
+ con << tOutput( "$resource_no_write", savepath );
+ return 3;
+ }
+
+ //xmlNanoHTTPFetchContent( ctxt, &buf, &len );
+ int maxlen = 10000;
+ buf = (char*)malloc(maxlen);
+ while( (len = xmlNanoHTTPRead(ctxt, buf, maxlen)) > 0 ) {
+ fwrite(buf, len, 1, fd);
+ }
+ free(buf);
+
+ xmlNanoHTTPClose(ctxt);
+ fclose(fd);
+
+
+ con << "OK\n";
+
+ return 0;
+}
+
+static int myFetch(const char *URIs, const char *filename, const char *savepath) {
+ const char *r = URIs, *p, *n;
+ char *u;
+ size_t len;
+ int rv = -1;
+ // r = unprocessed data p = end-of-item + 1 u = item
+ // n = to-be r len = length of item savepath = result filepath
+
+ while (r[0] != '\0') {
+ while (r[0] == ' ') ++r; // skip spaces at the start of the item
+ (p = strchr(r, ';')) ? 0 : (p = strchr(r, '\0'));
+ n = (p[0] == '\0') ? p : (p + 1); // next item starts after the semicolon
+ // NOTE: skip semicolons, *NOT* nulls
+ while (p[-1] == ' ') --p; // skip spaces at the end of the item
+ len = (size_t)(p - r);
+ if (len > 0) { // skip this for null-length items
+ u = (char*)malloc((len + 1) * sizeof(char));
+ strncpy(u, r, len);
+ u[len] = '\0'; // u now contains the individual URI
+ rv = myHTTPFetch(u, filename, savepath); // TODO: handle other protocols?
+ free(u);
+ if (rv == 0) return 0; // If successful, return the file retrieved
+ }
+ r = n; // move onto the next item
+ }
+
+ return rv; // last error
+}
+
+/*
+Allows for the fetching and caching of ressources available on the web,
+such as maps (xml), texture (jpg, gif, bmp), sound and models.
+Nota: On some forums (such as guru3.sytes.net), it is possible for the
+download link not give information about the filename or type, ie:
+http://guru3.sytes.net/download.php?id=1191. This is why the filename
+parameter is required.
+Parameters:
+uri: The full uri to obtain the ressource
+filename: The filename to use for the local ressource
+Return a file handle to the ressource
+NOTE: There must be *at least* one directory level, even if it is ./
+*/
+tString tResourceManager::locateResource(const char *file, const char *uri) {
+ tString filepath, a_uri = tString(), savepath;
+ int rv;
+
+ char * to_free = NULL; // string to delete later
+
+ {
+ char const *pos, *posb;
+ char *nf;
+ size_t l;
+
+ // Step 1: If 'file' has an open paren, cut everything after it off
+ if ( (pos = strchr(file, '(')) ) {
+ l = (size_t)(pos - file);
+ nf = (char*)malloc((l + 1) * sizeof(char));
+ strncpy(nf, file, l);
+ nf[l] = '\0';
+ file = nf;
+ to_free = nf;
+
+ // Step 2: Extract URI, if any
+ ++pos;
+ if ( (posb = strchr(pos, ')')) ) {
+ l = (size_t)(posb - pos);
+ nf = (char*)malloc((l + 1) * sizeof(char));
+ strncpy(nf, pos, l);
+ nf[l] = '\0';
+ a_uri << nf << ';';
+ free( nf );
+ }
+ }
+ }
+ // Validate paths and determine detination savepath
+ if (!file || file[0] == '\0') {
+ con << tOutput( "$resource_no_filename" );
+ return (tString) NULL;
+ }
+ if (file[0] == '/' || file[0] == '\\') {
+ con << tOutput( "$resource_abs_path" );
+ return (tString) NULL;
+ }
+ savepath = tDirectories::Resource().GetWritePath(file);
+ if (savepath == "") {
+ con << tOutput( "$resource_no_writepath" );
+ return (tString) NULL;
+ }
+
+ // Do we have this file locally ?
+ filepath = tDirectories::Resource().GetReadPath(file);
+
+ if (filepath != "")
+ {
+ if ( NULL != to_free )
+ free( to_free );
+ return filepath;
+ }
+
+ // Some sort of File not found
+ if (uri && strcmp("0", uri))
+ a_uri << uri << ';';
+
+ // add repositories to uri
+ if ( AccessRepoServer().Len() > 2 )
+ a_uri << AccessRepoServer() << file << ';';
+
+ if ( AccessRepoClient().Len() > 2 && AccessRepoClient() != AccessRepoServer() )
+ a_uri << AccessRepoClient() << file << ';';
+
+ con << tOutput( "$resource_not_cached", file );
+
+ rv = myFetch((const char *)a_uri, file, (const char *)savepath);
+
+ if ( NULL != to_free )
+ free( to_free );
+
+ if (rv)
+ return (tString) NULL;
+ return savepath;
+}
+
+FILE* tResourceManager::openResource(const char *file, const char *uri) {
+ tString filepath;
+ filepath = locateResource(file, uri);
+ if ( filepath.Len() <= 1 )
+ return NULL;
+ return fopen((const char *)filepath, "r");
+}
+
+static void RInclude(std::istream& s)
+{
+ tString file;
+ s >> file;
+
+ tString rclcl = tResourceManager::locateResource(NULL, file);
+ if ( rclcl ) {
+ std::ifstream rc(rclcl);
+ tConfItemBase::LoadAll(rc, false );
+ return;
+ }
+
+ con << tOutput( "$config_rinclude_not_found", file );
+}
+
+static tConfItemFunc s_RInclude("RINCLUDE", &RInclude);
+
+static bool st_checkAuthor(tString const &Author) {
+ if(Author.empty() || Author[0] < 'A' || Author[0] > 'z' || Author[0] > 'Z' && Author[0] < 'a' || Author.find('/') != tString::npos) {
+ tERR_WARN("Resource authors must start with a letter and may not contain slashes");
+ return false;
+ }
+ return true;
+}
+static bool st_checkCategory(tString const &Category) {
+ if(Category[0] == '/' || *Category.rbegin() == '/' || Category.find("/.") != tString::npos) {
+ tERR_WARN("Resource categories must not start or end with a slash or dot or contain the sequence \"./\".");
+ return false;
+ }
+ return true;
+}
+static bool st_checkName(tString const &Name) {
+ if(Name.empty() || Name[0] == '.' || Name.find_first_of("-/") != tString::npos) {
+ tERR_WARN("Resource names must not start with a dot or contain slashes or minus signs");
+ return false;
+ }
+ return true;
+}
+static bool st_checkExtension(tString const &Extension) {
+ if(Extension.empty() || Extension.find_first_of("/.") != tString::npos) {
+ tERR_WARN("Resource extensions must not contain slashes or dots");
+ return false;
+ }
+ return true;
+}
+static bool st_checkType(tString const &Type) {
+ if(Type.empty() || Type.find_first_of("/.") != tString::npos) {
+ tERR_WARN("Resource types must not contain slashes or dots");
+ return false;
+ }
+ return true;
+}
+static bool st_checkVersion(tString const &Version) {
+ if(Version.empty() || Version.find('/') != tString::npos) {
+ tERR_WARN("Resource versions must not contain slashes");
+ return false;
+ }
+ return true;
+}
+
+tResourcePath::tResourcePath(tString const &Author,
+ tString const &Category,
+ tString const &Name,
+ tString const &Version,
+ tString const &Type,
+ tString const &Extension,
+ tString const &URI) :
+ m_Author (Author ),
+ m_Category (Category ),
+ m_Name (Name ),
+ m_Version (Version ),
+ m_Type (Type ),
+ m_Extension(Extension),
+ m_URI (URI ),
+ m_Valid(false) {
+ m_Path << Author << '/';
+ if(!st_checkAuthor(Author)) return;
+ if(!Category.empty()) {
+ if(!st_checkCategory(Category)) return;
+ m_Path << Category << '/';
+ }
+ if(!st_checkName(Name)) return;
+ if(!st_checkExtension(Extension)) return;
+ if(!st_checkType(Extension)) return;
+ if(!st_checkVersion(Version)) return;
+ m_Path << Name << '-' << Version << '.' << Type << '.' << Extension;
+ if(!URI.empty()) {
+ m_Path << '(' << URI << ')';
+ }
+ m_Valid = true;
+}
+
+tResourcePath::tResourcePath(tString const &Path) : m_Path(Path), m_Valid(false) {
+ // check if an URI is attached
+ tString::size_type uridelim = m_Path.find('(');
+ if(uridelim != tString::npos) {
+ // find the corresponding opening bracket
+ if(*m_Path.rbegin() != ')') {
+ tERR_WARN("Incomplete URI specification");
+ return;
+ }
+ m_URI = m_Path.substr(uridelim + 1, m_Path.size() - uridelim - 2);
+ --uridelim;
+ } else {
+ uridelim = m_Path.size() - 1;
+ }
+
+ tString::size_type authordelim = Path.find('/');
+ if(authordelim == tString::npos || authordelim >= uridelim) {
+ tERR_WARN("Resource paths need to contain at least one slash");
+ return;
+ }
+ m_Author = Path.substr(0, authordelim);
+ if(!st_checkAuthor(m_Author)) return;
+ tString::size_type categorydelim = Path.rfind('/', uridelim);
+ if(categorydelim != authordelim) {
+ m_Category = Path.substr(authordelim + 1, categorydelim - authordelim - 1);
+ if(!st_checkCategory(m_Category)) return;
+ }
+ tString::size_type namedelim = Path.find('-', categorydelim);
+ if(namedelim == tString::npos || namedelim >= uridelim) {
+ tERR_WARN("Resource path is missing the version delimiter ('-')");
+ return;
+ }
+ m_Name = Path.substr(categorydelim+1, namedelim - categorydelim - 1);
+ if(!st_checkName(m_Name)) return;
+
+ // now parse from the back to the front to find the version (which can
+ // contain dots)
+ tString::size_type extensiondelim = Path.rfind('.', uridelim);
+ if(extensiondelim == tString::npos || extensiondelim <= namedelim || extensiondelim >= Path.size() - 1) {
+ tERR_WARN("Resource path is missing the extension delimiter ('.')");
+ }
+ m_Extension = Path.substr(extensiondelim + 1, uridelim - extensiondelim);
+ if(!st_checkExtension(m_Extension)) return;
+ tString::size_type typedelim = Path.rfind('.', extensiondelim - 1);
+ if(typedelim == tString::npos || typedelim <= namedelim) {
+ tERR_WARN("Resource path is missing the type delimiter ('.')");
+ }
+ m_Type = Path.substr(typedelim + 1, extensiondelim - typedelim - 1);
+ if(!st_checkType(m_Type)) return;
+
+ // the rest is (hopefully) the version, now...
+ m_Version = Path.substr(namedelim + 1, typedelim - namedelim - 1);
+ if(!st_checkVersion(m_Version)) return;
+ m_Valid=true;
+}
+
+bool tResourcePath::operator==(tResourcePath const &other) const {
+ return m_Author == other.m_Author &&
+ m_Category == other.m_Category &&
+ m_Name == other.m_Name &&
+ m_Version == other.m_Version &&
+ m_Type == other.m_Type &&
+ m_Extension == other.m_Extension;
+}
+
+// separate implementation to exploit lazy condition evaluation
+bool tResourcePath::operator!=(tResourcePath const &other) const {
+ return m_Author != other.m_Author ||
+ m_Category != other.m_Category ||
+ m_Name != other.m_Name ||
+ m_Version != other.m_Version ||
+ m_Type != other.m_Type ||
+ m_Extension != other.m_Extension;
+}
Copied: armagetronad/trunk/armagetronad/src/resource/tResourceManager.h (from rev 8507, armagetronad/trunk/armagetronad/src/tools/tResourceManager.h)
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.h (rev 0)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2008-08-24 02:49:51 UTC (rev 8522)
@@ -0,0 +1,118 @@
+#ifndef ArmageTron_RESOURCEMANAGER_H
+#define ArmageTron_RESOURCEMANAGER_H
+
+#include <boost/smart_ptr.hpp>
+
+#include "tString.h"
+
+class tResource;
+
+typedef int (*tNewResourceFunc)(const char* path);
+
+//! Shortcut for casting to tResource*
+#define resource_cast(a) dynamic_cast<tResource *> (a)
+
+//! resource manager: fetches and caches resources from repositories or arbitrary URIs
+/**
+ * put detailed docs here
+ */
+class tResourceManager {
+public:
+ //! When finished, this will be the preferred way to load a resource.
+ /**
+ @param file the full path to the file
+ @param typeID the unique identifier for the resource type, which is in turn returned
+ from RegisterResourceType
+ @see RegisterResourceType
+ */
+ static tResource* GetResource(const char *file, int typeID);
+
+ //! Register a resource type.
+ /**
+ @param func a function that returns a new instance of the resource
+ @return the unique identifier for the function. Use this in subsequence calls to GetResource.
+
+ When you create a new resource type, you must register a function that will instantiate
+ that new type. Later on you'll call tResourceManager to instantiate the type for a
+ resource that's needed and you'll need to know the identifier returned from this method.
+ */
+ static int RegisterResourceType(tNewResourceFunc func);
+
+ //! Return the position of the resource in the cache
+ static tString locateResource(const char *file, const char *uri="");
+ //! opens a resource
+ static FILE *openResource(const char *pathname, const char *uri="");
+
+ //! server determined resource repository
+ static tString & AccessRepoServer();
+
+ //! client determined resource repository
+ static tString & AccessRepoClient();
+
+ //! register a resource component loader
+ // todo: finish this
+ static void RegisterLoader();
+
+ //! Convenient typedef for a type that stores references to the resource
+ /// manager.
+ typedef boost::shared_ptr<tResourceManager> Reference;
+
+ //! tResourceManager is a singleton, and this is how you get the
+ /// global instance of it.
+ Reference GetResourceManager();
+
+ ~tResourceManager();
+private:
+ //! The only instance of tResourceManager allowed
+ static Reference __inst;
+
+ //! We make the constructor private so that nobody else can
+ /// instantiate this class
+ tResourceManager();
+};
+
+//! helper class to construct a resource path
+class tResourcePath
+{
+ tString m_Author; //!< the author of the resource
+ tString m_Category; //!< the category of the resource
+ tString m_Name; //!< the name of the resource
+ tString m_Version; //!< the version of the resource
+ tString m_Type; //!< the type of the resource
+ tString m_Extension;//!< the extension (like xml or png)
+ tString m_URI; //!< the URI to the file, if any
+ tString m_Path; //!< the full path of the resource
+
+ bool m_Valid;
+public:
+ tString const &Author () const {return m_Author ;} //!< get the author of the resource
+ tString const &Category () const {return m_Category ;} //!< get the category of the resource
+ tString const &Name () const {return m_Name ;} //!< get the name of the resource
+ tString const &Version () const {return m_Version ;} //!< get the version of the resource
+ tString const &Type () const {return m_Type ;} //!< get the type of the resource
+ tString const &Extension() const {return m_Extension;} //!< get the extension (like xml or png)
+ tString const &URI () const {return m_URI ;} //!< get the URI to the file, if any
+ tString const &Path () const {return m_Path ;} //!< get the full path of the resource
+
+ bool Valid() const {return m_Valid;} //!< is this a valid resource path?
+
+ //! default constructor. Valid() will return false if called on an object constructed this way.
+ tResourcePath():m_Valid(false){}
+
+ //! construct the path from the given arguments
+ tResourcePath(tString const &Author,
+ tString const &Category,
+ tString const &Name,
+ tString const &Version,
+ tString const &Type,
+ tString const &Extension,
+ tString const &URI);
+
+ //! construct a path from a resource location
+ tResourcePath(tString const &path);
+
+ bool operator==(tResourcePath const &other) const;
+ bool operator!=(tResourcePath const &other) const;
+};
+
+#endif //ArmageTron_RESOURCEMANAGER_H
Deleted: armagetronad/trunk/armagetronad/src/tools/tResource.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tResource.cpp 2008-08-23 19:19:21 UTC (rev 8521)
+++ armagetronad/trunk/armagetronad/src/tools/tResource.cpp 2008-08-24 02:49:51 UTC (rev 8522)
@@ -1,29 +0,0 @@
-/*
-
-*************************************************************************
-
-ArmageTron -- Just another Tron Lightcycle Game in 3D.
-Copyright (C) 2005 by
-and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
-
-**************************************************************************
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-***************************************************************************
-
-*/
-
-//#include ".h"
Deleted: armagetronad/trunk/armagetronad/src/tools/tResource.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tResource.h 2008-08-23 19:19:21 UTC (rev 8521)
+++ armagetronad/trunk/armagetronad/src/tools/tResource.h 2008-08-24 02:49:51 UTC (rev 8522)
@@ -1,38 +0,0 @@
-/*
-
-*************************************************************************
-
-ArmageTron -- Just another Tron Lightcycle Game in 3D.
-Copyright (C) 2005 by
-and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
-
-**************************************************************************
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-***************************************************************************
-
-*/
-
-#ifndef ArmageTron_TRESOURCE_H
-#define ArmageTron_TRESOURCE_H
-
-class tResource {
-public:
-
-private:
-};
-
-#endif
Deleted: armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp 2008-08-23 19:19:21 UTC (rev 8521)
+++ armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp 2008-08-24 02:49:51 UTC (rev 8522)
@@ -1,393 +0,0 @@
-#include "aa_config.h"
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <libxml/nanohttp.h>
-
-#include "tConfiguration.h"
-#include "tDirectories.h"
-#include "tResourceManager.h"
-#include "tString.h"
-
-void tResourceManager::RegisterLoader()
-{
-}
-
-tResource* tResourceManager::GetResource(const char *file, int typeID)
-{
- // stub
- return NULL;
-}
-
-int tResourceManager::RegisterResourceType(tNewResourceFunc func) {
- // stub
- return 0;
-}
-
-//tResource* GetResource(const char *file, int typeID) {
-// // stub
-//}
-
-// server determined resource repository
-tString & tResourceManager::AccessRepoServer()
-{
- static tString resRepoServer("http://resource.armagetronad.net/resource/");
- return resRepoServer;
-}
-// the nSettingItem is in gStuff.cpp
-
-// client determined resource repository
-tString & tResourceManager::AccessRepoClient()
-{
- static tString resRepoClient("http://resource.armagetronad.net/resource/");
- return resRepoClient;
-}
-
-static tSettingItem<tString> conf_res_repo("RESOURCE_REPOSITORY_CLIENT", tResourceManager::AccessRepoClient());
-
-static int myHTTPFetch(const char *URI, const char *filename, const char *savepath)
-{
- void *ctxt = NULL;
- char *buf = NULL;
- FILE* fd;
- int len, rc;
-
- con << tOutput( "$resource_downloading", URI );
- // con << "Downloading " << URI << "...\n";
-
- ctxt = xmlNanoHTTPOpen(URI, NULL);
- if (ctxt == NULL) {
- con << "ERROR: ctxt is NULL\n";
- return 1;
- }
-
- if ( (rc = xmlNanoHTTPReturnCode(ctxt)) != 200 ) {
- con << tOutput( rc == 404 ? "$resource_fetcherror_404" : "$resource_fetcherror", rc );
- return 2;
- }
-
- fd = fopen(savepath, "wb");
- if (fd < 0) {
- xmlNanoHTTPClose(ctxt);
- con << tOutput( "$resource_no_write", savepath );
- return 3;
- }
-
- //xmlNanoHTTPFetchContent( ctxt, &buf, &len );
- int maxlen = 10000;
- buf = (char*)malloc(maxlen);
- while( (len = xmlNanoHTTPRead(ctxt, buf, maxlen)) > 0 ) {
- fwrite(buf, len, 1, fd);
- }
- free(buf);
-
- xmlNanoHTTPClose(ctxt);
- fclose(fd);
-
-
- con << "OK\n";
-
- return 0;
-}
-
-static int myFetch(const char *URIs, const char *filename, const char *savepath) {
- const char *r = URIs, *p, *n;
- char *u;
- size_t len;
- int rv = -1;
- // r = unprocessed data p = end-of-item + 1 u = item
- // n = to-be r len = length of item savepath = result filepath
-
- while (r[0] != '\0') {
- while (r[0] == ' ') ++r; // skip spaces at the start of the item
- (p = strchr(r, ';')) ? 0 : (p = strchr(r, '\0'));
- n = (p[0] == '\0') ? p : (p + 1); // next item starts after the semicolon
- // NOTE: skip semicolons, *NOT* nulls
- while (p[-1] == ' ') --p; // skip spaces at the end of the item
- len = (size_t)(p - r);
- if (len > 0) { // skip this for null-length items
- u = (char*)malloc((len + 1) * sizeof(char));
- strncpy(u, r, len);
- u[len] = '\0'; // u now contains the individual URI
- rv = myHTTPFetch(u, filename, savepath); // TODO: handle other protocols?
- free(u);
- if (rv == 0) return 0; // If successful, return the file retrieved
- }
- r = n; // move onto the next item
- }
-
- return rv; // last error
-}
-
-/*
-Allows for the fetching and caching of ressources available on the web,
-such as maps (xml), texture (jpg, gif, bmp), sound and models.
-Nota: On some forums (such as guru3.sytes.net), it is possible for the
-download link not give information about the filename or type, ie:
-http://guru3.sytes.net/download.php?id=1191. This is why the filename
-parameter is required.
-Parameters:
-uri: The full uri to obtain the ressource
-filename: The filename to use for the local ressource
-Return a file handle to the ressource
-NOTE: There must be *at least* one directory level, even if it is ./
-*/
-tString tResourceManager::locateResource(const char *file, const char *uri) {
- tString filepath, a_uri = tString(), savepath;
- int rv;
-
- char * to_free = NULL; // string to delete later
-
- {
- char const *pos, *posb;
- char *nf;
- size_t l;
-
- // Step 1: If 'file' has an open paren, cut everything after it off
- if ( (pos = strchr(file, '(')) ) {
- l = (size_t)(pos - file);
- nf = (char*)malloc((l + 1) * sizeof(char));
- strncpy(nf, file, l);
- nf[l] = '\0';
- file = nf;
- to_free = nf;
-
- // Step 2: Extract URI, if any
- ++pos;
- if ( (posb = strchr(pos, ')')) ) {
- l = (size_t)(posb - pos);
- nf = (char*)malloc((l + 1) * sizeof(char));
- strncpy(nf, pos, l);
- nf[l] = '\0';
- a_uri << nf << ';';
- free( nf );
- }
- }
- }
- // Validate paths and determine detination savepath
- if (!file || file[0] == '\0') {
- con << tOutput( "$resource_no_filename" );
- return (tString) NULL;
- }
- if (file[0] == '/' || file[0] == '\\') {
- con << tOutput( "$resource_abs_path" );
- return (tString) NULL;
- }
- savepath = tDirectories::Resource().GetWritePath(file);
- if (savepath == "") {
- con << tOutput( "$resource_no_writepath" );
- return (tString) NULL;
- }
-
- // Do we have this file locally ?
- filepath = tDirectories::Resource().GetReadPath(file);
-
- if (filepath != "")
- {
- if ( NULL != to_free )
- free( to_free );
- return filepath;
- }
-
- // Some sort of File not found
- if (uri && strcmp("0", uri))
- a_uri << uri << ';';
-
- // add repositories to uri
- if ( AccessRepoServer().Len() > 2 )
- a_uri << AccessRepoServer() << file << ';';
-
- if ( AccessRepoClient().Len() > 2 && AccessRepoClient() != AccessRepoServer() )
- a_uri << AccessRepoClient() << file << ';';
-
- con << tOutput( "$resource_not_cached", file );
-
- rv = myFetch((const char *)a_uri, file, (const char *)savepath);
-
- if ( NULL != to_free )
- free( to_free );
-
- if (rv)
- return (tString) NULL;
- return savepath;
-}
-
-FILE* tResourceManager::openResource(const char *file, const char *uri) {
- tString filepath;
- filepath = locateResource(file, uri);
- if ( filepath.Len() <= 1 )
- return NULL;
- return fopen((const char *)filepath, "r");
-}
-
-static void RInclude(std::istream& s)
-{
- tString file;
- s >> file;
-
- tString rclcl = tResourceManager::locateResource(NULL, file);
- if ( rclcl ) {
- std::ifstream rc(rclcl);
- tConfItemBase::LoadAll(rc, false );
- return;
- }
-
- con << tOutput( "$config_rinclude_not_found", file );
-}
-
-static tConfItemFunc s_RInclude("RINCLUDE", &RInclude);
-
-static bool st_checkAuthor(tString const &Author) {
- if(Author.empty() || Author[0] < 'A' || Author[0] > 'z' || Author[0] > 'Z' && Author[0] < 'a' || Author.find('/') != tString::npos) {
- tERR_WARN("Resource authors must start with a letter and may not contain slashes");
- return false;
- }
- return true;
-}
-static bool st_checkCategory(tString const &Category) {
- if(Category[0] == '/' || *Category.rbegin() == '/' || Category.find("/.") != tString::npos) {
- tERR_WARN("Resource categories must not start or end with a slash or dot or contain the sequence \"./\".");
- return false;
- }
- return true;
-}
-static bool st_checkName(tString const &Name) {
- if(Name.empty() || Name[0] == '.' || Name.find_first_of("-/") != tString::npos) {
- tERR_WARN("Resource names must not start with a dot or contain slashes or minus signs");
- return false;
- }
- return true;
-}
-static bool st_checkExtension(tString const &Extension) {
- if(Extension.empty() || Extension.find_first_of("/.") != tString::npos) {
- tERR_WARN("Resource extensions must not contain slashes or dots");
- return false;
- }
- return true;
-}
-static bool st_checkType(tString const &Type) {
- if(Type.empty() || Type.find_first_of("/.") != tString::npos) {
- tERR_WARN("Resource types must not contain slashes or dots");
- return false;
- }
- return true;
-}
-static bool st_checkVersion(tString const &Version) {
- if(Version.empty() || Version.find('/') != tString::npos) {
- tERR_WARN("Resource versions must not contain slashes");
- return false;
- }
- return true;
-}
-
-tResourcePath::tResourcePath(tSt...
[truncated message content] |
![http://wrtlprnft.ath.cx/floor.png"](http://wrtlprnft.ath.cx/floor.png"){kind=link}
![http://wrtlprnft.ath.cx/benboisclock.png"](http://wrtlprnft.ath.cx/benboisclock.png"){kind=link}
|
From: <baz...@us...> - 2008-08-24 23:01:03
|
Revision: 8523
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8523&view=rev
Author: bazaarmagetron
Date: 2008-08-24 23:01:12 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
da...@da...: Work on resource system
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/resource/tResource.h
armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp
armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
Added Paths:
-----------
armagetronad/trunk/armagetronad/src/tools/tDict.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-08-23 21:10:14.457000017 -0500
committer: Dave Fancella <da...@da...>
properties:
branch-nick: trunk
+ timestamp: 2008-08-24 00:54:26.786000013 -0500
committer: da...@da...
properties:
branch-nick: trunk
Modified: bzr:file-ids
- src/resource srcresource-20080823193337-xmrk7wrw1l3ud1f2-1
src/resource/tResource.h 6218@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftools%2FtResource.h
src/resource/tResourceManager.cpp 4612@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftools%2FtResourceManager.cpp
src/resource/tResource.cpp 6218@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftools%2FtResource.cpp
src/resource/tResourceManager.h 4612@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftools%2FtResourceManager.h
+ src/tools/tDict.h tdict.h-20080824033530-lvbnzhgq05kqgdv8-1
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/resource/tResource.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResource.h 2008-08-24 02:49:51 UTC (rev 8522)
+++ armagetronad/trunk/armagetronad/src/resource/tResource.h 2008-08-24 23:01:12 UTC (rev 8523)
@@ -33,6 +33,8 @@
#include "tResourceManager.h"
+class tResource;
+
class tResource : public tXmlParser {
public:
bool LoadFile(const char* filename, const char* uri="");
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp 2008-08-24 02:49:51 UTC (rev 8522)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp 2008-08-24 23:01:12 UTC (rev 8523)
@@ -10,19 +10,52 @@
#include <libxml/nanohttp.h>
#include "tConfiguration.h"
+#include "tDict.h"
#include "tDirectories.h"
#include "tResourceManager.h"
#include "tString.h"
+/****************************************************************
+ * tResourceType *
+ ***************************************************************/
+
+/** This constructor is the one you should always use. Make sure
+ * you create a function with the signature for tNewResourceType
+ * that returns a newly created instance of your tResource subclass
+ * that has been typecasted to tResource. The Resource Manager will
+ * use the function you provide to create new instances of your
+ * resource type
+ *
+ * \param name the name of the resource type
+ * \param description a human readable description of the resource type
+ * \param extension the filename extension that will be found on disk
+ * \param creator a function that creates a new instance of the resource
+ */
+tResourceType::tResourceType(const char* name, const char* description, const char* extension,
+ tNewResourceType creator) {
+ m_Name = tString(name);
+}
+
+
+/***************************************************************
+ * tResourceManager *
+ ***************************************************************/
+
// This is a little ugly, open to suggestions :)
tResourceManager::Reference tResourceManager::__inst = tResourceManager::Reference(new tResourceManager() );
+tStringDict<tResourceType::Reference>*
+ tResourceManager::m_ResourceList = new tStringDict<tResourceType::Reference>();
+/** The constructor for tResourceManager. */
tResourceManager::tResourceManager() {
// stub constructor for now
}
tResourceManager::~tResourceManager() { }
+/** When you need to carry a local reference for the Resource Manager,
+ * use this method to do so. It may be more convenient for you thataway.
+ */
tResourceManager::Reference tResourceManager::GetResourceManager() {
if(!__inst) {
__inst = Reference(new tResourceManager() );
@@ -31,6 +64,8 @@
return Reference(__inst);
}
+/** Used by tResourceLoader to register a file loader of some sort.
+ */
void tResourceManager::RegisterLoader()
{
}
@@ -41,8 +76,11 @@
return NULL;
}
-int tResourceManager::RegisterResourceType(tNewResourceFunc func) {
- // stub
+int tResourceManager::RegisterResourceType(tResourceType& newType) {
+ if(!m_ResourceList->HasKey(newType.GetName() ) ) {
+ m_ResourceList[newType.GetName()] = newType.Get_reference();
+ return 1;
+ }
return 0;
}
@@ -302,6 +340,11 @@
return true;
}
+/****************************************************************
+ * tResourcePath *
+ ****************************************************************/
+
+
tResourcePath::tResourcePath(tString const &Author,
tString const &Category,
tString const &Name,
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2008-08-24 02:49:51 UTC (rev 8522)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2008-08-24 23:01:12 UTC (rev 8523)
@@ -1,3 +1,32 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2005 by
+and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+***************************************************************************
+
+*/
+
+
#ifndef ArmageTron_RESOURCEMANAGER_H
#define ArmageTron_RESOURCEMANAGER_H
@@ -3,13 +32,40 @@
#include <boost/smart_ptr.hpp>
+#include "tDict.h"
#include "tString.h"
class tResource;
-typedef int (*tNewResourceFunc)(const char* path);
+typedef tResource* (*tNewResourceType)(const char* path);
//! Shortcut for casting to tResource*
#define resource_cast(a) dynamic_cast<tResource *> (a)
+/** tResourceType describes a resource type to the resource system.
+ * Upon instantiation, it reports itself to tResourceManager so
+ * it can be used by whoever needs to use it.
+ **/
+class tResourceType {
+public:
+ /// This constructor is used by the resource to create new instances
+ /// of the resource type.
+ tResourceType(const char* name, const char* description, const char* extension,
+ tNewResourceType creator);
+
+ /// Returns the name of the resource type
+ const tString& GetName() { return m_Name; };
+
+ //! Convenient typedef for a type that stores references to the resource
+ /// type.
+ typedef boost::shared_ptr<tResourceType> Reference;
+
+ Reference Get_reference() { return Reference(this); };
+private:
+ /// We make this constructor private so nobody will use it
+ tResourceType();
+
+ tString m_Name;
+};
+
//! resource manager: fetches and caches resources from repositories or arbitrary URIs
/**
@@ -29,6 +85,8 @@
//! Register a resource type.
/**
+ @param name the name of the resource type
+ @param description a human readable description of the resource type
@param func a function that returns a new instance of the resource
@return the unique identifier for the function. Use this in subsequence calls to GetResource.
@@ -36,7 +94,7 @@
that new type. Later on you'll call tResourceManager to instantiate the type for a
resource that's needed and you'll need to know the identifier returned from this method.
*/
- static int RegisterResourceType(tNewResourceFunc func);
+ static int RegisterResourceType(tResourceType& newType);
//! Return the position of the resource in the cache
static tString locateResource(const char *file, const char *uri="");
@@ -66,6 +124,8 @@
//! The only instance of tResourceManager allowed
static Reference __inst;
+ static tStringDict<tResourceType::Reference>* m_ResourceList;
+
//! We make the constructor private so that nobody else can
/// instantiate this class
tResourceManager();
@@ -115,4 +175,5 @@
bool operator!=(tResourcePath const &other) const;
};
+
#endif //ArmageTron_RESOURCEMANAGER_H
Added: armagetronad/trunk/armagetronad/src/tools/tDict.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tDict.h (rev 0)
+++ armagetronad/trunk/armagetronad/src/tools/tDict.h 2008-08-24 23:01:12 UTC (rev 8523)
@@ -0,0 +1,61 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2005 by
+and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+***************************************************************************
+
+*/
+
+
+#ifndef TDICT_H
+#define TDICT_H
+
+#include <map>
+#include <string>
+#include <functional>
+
+#include "tString.h"
+
+class RuntimeStringCmp {
+public:
+ // the comparison
+ bool operator() (const tString& s1, const tString& s2) const {
+ return s1.Compare(s2);
+ }
+};
+
+template <typename T, typename A, typename S=std::less<T> >
+class tDict : public std::map<T, A, S> {
+public:
+ inline bool HasKey(T x) {
+ return (this->find(x)!=this->end() );
+ }
+};
+
+template <typename R>
+class tStringDict : public tDict<tString, R, RuntimeStringCmp> {
+public:
+ tStringDict() : std::map<tString, R, RuntimeStringCmp>(RuntimeStringCmp()) { };
+};
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-08-24 23:01:56
|
Revision: 8524
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8524&view=rev
Author: bazaarmagetron
Date: 2008-08-24 23:02:05 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
da...@da...: Factored tResourceType into its own file
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/resource/tResource.h
armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp
armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
Added Paths:
-----------
armagetronad/trunk/armagetronad/src/resource/tResourceType.cpp
armagetronad/trunk/armagetronad/src/resource/tResourceType.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-08-24 00:54:26.786000013 -0500
committer: da...@da...
properties:
branch-nick: trunk
+ timestamp: 2008-08-24 12:24:32.589999914 -0500
committer: da...@da...
properties:
branch-nick: trunk
Modified: bzr:file-ids
- src/tools/tDict.h tdict.h-20080824033530-lvbnzhgq05kqgdv8-1
+ src/resource/tResourceType.h tresourcetype.h-20080824172420-l41jc3jm58tatl8n-1
src/resource/tResourceType.cpp tresourcetype.cpp-20080824172422-2jy0oe77ul2mkvns-1
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/resource/tResource.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResource.h 2008-08-24 23:01:12 UTC (rev 8523)
+++ armagetronad/trunk/armagetronad/src/resource/tResource.h 2008-08-24 23:02:05 UTC (rev 8524)
@@ -48,4 +48,8 @@
//! \deprecated
typedef tResource tXmlResource;
+//! Map type for storing tResource subclasses
+//typedef std::map< tString, tResource::Reference > tResourceMap;
+
+
#endif
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp 2008-08-24 23:01:12 UTC (rev 8523)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp 2008-08-24 23:02:05 UTC (rev 8524)
@@ -1,3 +1,31 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2005 by
+and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+***************************************************************************
+
+*/
+
#include "aa_config.h"
#include <errno.h>
@@ -15,36 +43,13 @@
#include "tResourceManager.h"
#include "tString.h"
-/****************************************************************
- * tResourceType *
- ***************************************************************/
-
-/** This constructor is the one you should always use. Make sure
- * you create a function with the signature for tNewResourceType
- * that returns a newly created instance of your tResource subclass
- * that has been typecasted to tResource. The Resource Manager will
- * use the function you provide to create new instances of your
- * resource type
- *
- * \param name the name of the resource type
- * \param description a human readable description of the resource type
- * \param extension the filename extension that will be found on disk
- * \param creator a function that creates a new instance of the resource
- */
-tResourceType::tResourceType(const char* name, const char* description, const char* extension,
- tNewResourceType creator) {
- m_Name = tString(name);
-}
-
-
/***************************************************************
* tResourceManager *
***************************************************************/
// This is a little ugly, open to suggestions :)
tResourceManager::Reference tResourceManager::__inst = tResourceManager::Reference(new tResourceManager() );
-tStringDict<tResourceType::Reference>*
- tResourceManager::m_ResourceList = new tStringDict<tResourceType::Reference>();
+tResourceTypeMap* tResourceManager::m_ResourceList = new tResourceTypeMap();
/** The constructor for tResourceManager. */
tResourceManager::tResourceManager() {
@@ -77,8 +82,8 @@
}
int tResourceManager::RegisterResourceType(tResourceType& newType) {
- if(!m_ResourceList->HasKey(newType.GetName() ) ) {
- m_ResourceList[newType.GetName()] = newType.Get_reference();
+ if(m_ResourceList->find(newType.GetName() ) == m_ResourceList->end() ) {
+ m_ResourceList->insert( make_pair( newType.GetName(), newType.Get_reference() ) );
return 1;
}
return 0;
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2008-08-24 23:01:12 UTC (rev 8523)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2008-08-24 23:02:05 UTC (rev 8524)
@@ -34,40 +34,13 @@
#include "tDict.h"
#include "tString.h"
+#include "tResourceType.h"
class tResource;
-
-typedef tResource* (*tNewResourceType)(const char* path);
-
+
//! Shortcut for casting to tResource*
#define resource_cast(a) dynamic_cast<tResource *> (a)
-/** tResourceType describes a resource type to the resource system.
- * Upon instantiation, it reports itself to tResourceManager so
- * it can be used by whoever needs to use it.
- **/
-class tResourceType {
-public:
- /// This constructor is used by the resource to create new instances
- /// of the resource type.
- tResourceType(const char* name, const char* description, const char* extension,
- tNewResourceType creator);
-
- /// Returns the name of the resource type
- const tString& GetName() { return m_Name; };
-
- //! Convenient typedef for a type that stores references to the resource
- /// type.
- typedef boost::shared_ptr<tResourceType> Reference;
-
- Reference Get_reference() { return Reference(this); };
-private:
- /// We make this constructor private so nobody will use it
- tResourceType();
-
- tString m_Name;
-};
-
//! resource manager: fetches and caches resources from repositories or arbitrary URIs
/**
* put detailed docs here
@@ -124,7 +97,7 @@
//! The only instance of tResourceManager allowed
static Reference __inst;
- static tStringDict<tResourceType::Reference>* m_ResourceList;
+ static tResourceTypeMap* m_ResourceList;
//! We make the constructor private so that nobody else can
/// instantiate this class
Added: armagetronad/trunk/armagetronad/src/resource/tResourceType.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceType.cpp (rev 0)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceType.cpp 2008-08-24 23:02:05 UTC (rev 8524)
@@ -0,0 +1,57 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2005 by
+and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+***************************************************************************
+
+*/
+
+#include "tString.h"
+
+#include "tResourceType.h"
+
+
+/****************************************************************
+ * tResourceType *
+ ***************************************************************/
+
+/** This constructor is the one you should always use. Make sure
+ * you create a function with the signature for tNewResourceType
+ * that returns a newly created instance of your tResource subclass
+ * that has been typecasted to tResource. The Resource Manager will
+ * use the function you provide to create new instances of your
+ * resource type
+ *
+ * \param name the name of the resource type
+ * \param description a human readable description of the resource type
+ * \param extension the filename extension that will be found on disk
+ * \param creator a function that creates a new instance of the resource
+ */
+tResourceType::tResourceType(const char* name, const char* description, const char* extension,
+ tNewResourceType creator) {
+ m_Name = tString(name);
+}
+
+
+
+
Added: armagetronad/trunk/armagetronad/src/resource/tResourceType.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceType.h (rev 0)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceType.h 2008-08-24 23:02:05 UTC (rev 8524)
@@ -0,0 +1,84 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2005 by
+and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+***************************************************************************
+
+*/
+
+#ifndef ArmageTron_RESOURCETYPE_H
+#define ArmageTron_RESOURCETYPE_H
+
+#include <boost/smart_ptr.hpp>
+
+#include "tString.h"
+
+class tResource;
+
+typedef tResource* (*tNewResourceType)(const char* path);
+
+
+/** tResourceType describes a resource type to the resource system.
+ * Upon instantiation, it reports itself to tResourceManager so
+ * it can be used by whoever needs to use it.
+ **/
+class tResourceType {
+public:
+ /// This constructor is used by the resource to create new instances
+ /// of the resource type.
+ tResourceType(const char* name, const char* description, const char* extension,
+ tNewResourceType creator);
+
+ /// Returns the name of the resource type
+ const tString& GetName() { return m_Name; };
+
+ /// Returns the description of the resource type
+ const tString& GetDescription() { return m_Description; };
+
+ /// Returns the file extension of the resource type
+ const tString& GetExtension() { return m_Extension; };
+
+ //! Convenient typedef for a type that stores references to the resource
+ /// type.
+ typedef boost::shared_ptr<tResourceType> Reference;
+
+ Reference Get_reference() { return Reference(this); };
+private:
+ /// We make this constructor private so nobody will use it
+ tResourceType();
+
+ /// The name of the resource type
+ tString m_Name;
+ /// A human readable description of the resource type
+ tString m_Description;
+ /// The file extension found on disk for the resource type
+ tString m_Extension;
+};
+
+//! Map type for storing tResourceTypes
+typedef std::map< tString, tResourceType::Reference > tResourceTypeMap;
+
+
+
+#endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-08-24 23:02:55
|
Revision: 8525
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8525&view=rev
Author: bazaarmagetron
Date: 2008-08-24 23:03:05 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
da...@da...: Wrapping up the day's work
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/Makefile.am
armagetronad/trunk/armagetronad/src/resource/tResource.h
armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp
armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
armagetronad/trunk/armagetronad/src/resource/tResourceType.cpp
armagetronad/trunk/armagetronad/src/resource/tResourceType.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-08-24 12:24:32.589999914 -0500
committer: da...@da...
properties:
branch-nick: trunk
+ timestamp: 2008-08-24 17:55:45.069000006 -0500
committer: da...@da...
properties:
branch-nick: trunk
Modified: bzr:file-ids
- src/resource/tResourceType.h tresourcetype.h-20080824172420-l41jc3jm58tatl8n-1
src/resource/tResourceType.cpp tresourcetype.cpp-20080824172422-2jy0oe77ul2mkvns-1
+
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2008-08-24 23:02:05 UTC (rev 8524)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2008-08-24 23:03:05 UTC (rev 8525)
@@ -89,7 +89,7 @@
tools/tFunction.h tools/tFunction.cpp\
tools/tPolynomial.h tools/tPolynomialMarshaler.h tools/tPolynomialWithBase.h \
tools/tRuby.h tools/tRuby.cpp \
- resource/tResource.h resource/tResource.cpp
+ resource/tResource.h resource/tResource.cpp resource/tResourceType.h resource/tResourceType.cpp
#tools/tCommandLine.cpp tools/tCommandLine.h
libnetwork_a_SOURCES=network/md5.cpp network/md5.h network/nAuthentication.cpp\
Modified: armagetronad/trunk/armagetronad/src/resource/tResource.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResource.h 2008-08-24 23:02:05 UTC (rev 8524)
+++ armagetronad/trunk/armagetronad/src/resource/tResource.h 2008-08-24 23:03:05 UTC (rev 8525)
@@ -29,16 +29,21 @@
#ifndef ArmageTron_TRESOURCE_H
#define ArmageTron_TRESOURCE_H
+#include <boost/smart_ptr.hpp>
+
#include "tXmlParser.h"
#include "tResourceManager.h"
-class tResource;
-
class tResource : public tXmlParser {
public:
bool LoadFile(const char* filename, const char* uri="");
- tResourcePath const &Path() const {return m_Path;} //!< get the resource path this file was loaded from
+
+ //!< get the resource path this file was loaded from
+ tResourcePath const &Path() const {return m_Path;}
+
+ //! Convenient typedef for references to tResources
+ typedef boost::shared_ptr<tResource> Reference;
protected:
bool ValidateXml(FILE* docfd, const char* uri, const char* filepath);
tResourcePath m_Path; //!< the resource identifier of this resource
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp 2008-08-24 23:02:05 UTC (rev 8524)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp 2008-08-24 23:03:05 UTC (rev 8525)
@@ -81,9 +81,16 @@
return NULL;
}
-int tResourceManager::RegisterResourceType(tResourceType& newType) {
- if(m_ResourceList->find(newType.GetName() ) == m_ResourceList->end() ) {
- m_ResourceList->insert( make_pair( newType.GetName(), newType.Get_reference() ) );
+/**
+ * Call RegisterResourceType when you want to register a new resource
+ * type. While that may be obvious, make sure you use the tResourceType
+ * class to describe the resource type.
+ *
+ * Ok, fine, there's nothing non-obvious about this method.
+ */
+int tResourceManager::RegisterResourceType(tResourceType* newType) {
+ if(m_ResourceList->find(newType->GetName() ) == m_ResourceList->end() ) {
+ m_ResourceList->insert( make_pair( newType->GetName(), newType->Get_reference() ) );
return 1;
}
return 0;
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2008-08-24 23:02:05 UTC (rev 8524)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2008-08-24 23:03:05 UTC (rev 8525)
@@ -67,10 +67,11 @@
that new type. Later on you'll call tResourceManager to instantiate the type for a
resource that's needed and you'll need to know the identifier returned from this method.
*/
- static int RegisterResourceType(tResourceType& newType);
+ static int RegisterResourceType(tResourceType* newType);
//! Return the position of the resource in the cache
static tString locateResource(const char *file, const char *uri="");
+
//! opens a resource
static FILE *openResource(const char *pathname, const char *uri="");
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceType.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceType.cpp 2008-08-24 23:02:05 UTC (rev 8524)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceType.cpp 2008-08-24 23:03:05 UTC (rev 8525)
@@ -26,6 +26,7 @@
*/
+#include "tResourceManager.h"
#include "tString.h"
#include "tResourceType.h"
@@ -50,6 +51,12 @@
tResourceType::tResourceType(const char* name, const char* description, const char* extension,
tNewResourceType creator) {
m_Name = tString(name);
+ m_Description = tString(description);
+ m_Extension = tString(extension);
+
+ m_Creator = creator;
+
+ tResourceManager::RegisterResourceType(this);
}
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceType.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceType.h 2008-08-24 23:02:05 UTC (rev 8524)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceType.h 2008-08-24 23:03:05 UTC (rev 8525)
@@ -67,6 +67,11 @@
/// We make this constructor private so nobody will use it
tResourceType();
+ /// This is the heart of the class, the function pointer that points
+ /// to a user-defined function that creates a new instance of a
+ /// tResource subclass
+ tNewResourceType m_Creator;
+
/// The name of the resource type
tString m_Name;
/// A human readable description of the resource type
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-11-28 21:55:25
|
Revision: 8605
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8605&view=rev
Author: bazaarmagetron
Date: 2008-11-28 21:55:16 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
epsy: fixed encoding issues
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/tools/tString.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-10-27 18:32:16.075999975 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
+ timestamp: 2008-10-27 21:35:05.845999956 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/tools/tString.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 21:54:07 UTC (rev 8604)
+++ armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 21:55:16 UTC (rev 8605)
@@ -1618,13 +1618,7 @@
static tNetCharacterFilter filter;
// run through string
- for( int i = Len()-2; i>=0; --i )
- {
- // character to filter
- char & my = (*this)(i);
-
- my = filter.Filter(my);
- }
+ filter.FilterString( *this );
}
bool st_colorStrings=true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-11-28 21:55:32
|
Revision: 8604
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8604&view=rev
Author: bazaarmagetron
Date: 2008-11-28 21:54:07 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
epsy: Fixed server name sorting in server browser. While 0.2.8.3 will be Manta's release, 0.3.2 will not ;)
Modified Paths:
--------------
armagetronad/trunk/armagetronad/AUTHORS
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
armagetronad/trunk/armagetronad/src/network/nServerInfo.h
armagetronad/trunk/armagetronad/src/tools/tString.cpp
armagetronad/trunk/armagetronad/src/tools/tString.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-08-24 17:55:45.069000006 -0500
committer: da...@da...
properties:
branch-nick: trunk
+ timestamp: 2008-10-27 18:32:16.075999975 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
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
+ 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
Modified: armagetronad/trunk/armagetronad/AUTHORS
===================================================================
--- armagetronad/trunk/armagetronad/AUTHORS 2008-11-28 21:44:18 UTC (rev 8603)
+++ armagetronad/trunk/armagetronad/AUTHORS 2008-11-28 21:54:07 UTC (rev 8604)
@@ -1,28 +1,30 @@
The AA-DevTeam currently consists of (alphabetic username order):
-+--------------------+---------------+-------------------------------------------+
-| Real name | SF username | Forum name (empty if identical to SF name)|
-+====================+===============+===========================================+
-| Dave Fancella | davidfancella | Lucifer |
-+--------------------+---------------+-------------------------------------------+
-| Fred | guru3 | Tank Program |
-+--------------------+---------------+-------------------------------------------+
-| Jochen Darley | yarrt | joda.bot |
-+--------------------+---------------+-------------------------------------------+
-| Peter | klaxnek | klax |
-+--------------------+---------------+-------------------------------------------+
-| Kurt Johnson | k_at_work | K |
-+--------------------+---------------+-------------------------------------------+
-| Luke-Jr | luke-jr | |
-+--------------------+---------------+-------------------------------------------+
-| Daniel Harple | nemostultae | |
-+--------------------+---------------+-------------------------------------------+
-| Philippe Villeneuve| philippeqc | |
-+--------------------+---------------+-------------------------------------------+
-| Mathias Plichta | wrtlprnft | |
-+--------------------+---------------+-------------------------------------------+
-| Manuel Moos | z-man | |
-+--------------------+---------------+-------------------------------------------+
++------------------+--+---------------+-------------------------------------------+
+| Real name | SF username | Forum name (empty if identical to SF name)|
++=====================+===============+===========================================+
+| Dave Fancella | davidfancella | Lucifer |
++---------------------+---------------+-------------------------------------------+
+| epsy | epsy | |
++---------------------+---------------+-------------------------------------------+
+| Fred | guru3 | Tank Program |
++---------------------+---------------+-------------------------------------------+
+| Jochen Darley | yarrt | joda.bot |
++---------------------+---------------+-------------------------------------------+
+| Peter | klaxnek | klax |
++---------------------+---------------+-------------------------------------------+
+| Kurt Johnson | k_at_work | K |
++---------------------+---------------+-------------------------------------------+
+| Luke-Jr | luke-jr | |
++---------------------+---------------+-------------------------------------------+
+| Daniel Harple | nemostultae | |
++---------------------+---------------+-------------------------------------------+
+| Philippe Villeneuve | philippeqc | |
++---------------------+---------------+-------------------------------------------+
+| Mathias Plichta | wrtlprnft | |
++---------------------+---------------+-------------------------------------------+
+| Manuel Moos | z-man | |
++---------------------+---------------+-------------------------------------------+
E-Mail addresses can be generated by taking the SF username and appending
"@users.sf.net". The forum is at http://forums.armagetronad.net.
@@ -39,8 +41,7 @@
? ? subby
where and when did he go?
-epsy : VOTING_SUSPEND console command
-
+
Additional contributions from
=============================
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-11-28 21:44:18 UTC (rev 8603)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-11-28 21:54:07 UTC (rev 8604)
@@ -7831,7 +7831,10 @@
char Filter( unsigned char in )
{
- return filter[ static_cast< unsigned int >( in )];
+ if ( filter[ static_cast< unsigned int >( in )] < 0 )
+ return '_';
+ else
+ return filter[ static_cast< unsigned int >( in )];
}
private:
void SetMap( int in1, int in2, unsigned char out)
Modified: armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-11-28 21:44:18 UTC (rev 8603)
+++ armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-11-28 21:54:07 UTC (rev 8604)
@@ -80,6 +80,8 @@
static tSettingItem< int > sn_numQueriesConf( "BROWSER_NUM_QUERIES", sn_numQueries );
static tSettingItem< int > sn_TNALostContactConf( "BROWSER_CONTACTLOSS", sn_TNALostContact );
+nServerInfoCharacterFilter sn_serverNameCharacterFilter;
+
static int sn_MaxUnreachable()
{
return sn_IsMaster ? 10 : 5;
@@ -164,6 +166,7 @@
timesNotAnswered(5),
stillOnMasterServer(false),
name(""),
+ nameForSorting(""),
users(0),
maxUsers_(MAXCLIENTS),
score(-10000),
@@ -268,6 +271,7 @@
static const tString KEY ("key");
static const tString TNA ("tna");
static const tString NAME ("name");
+static const tString FILTEREDNAME ("filteredName");
static const tString VERSION_TAG ("version");
static const tString RELEASE ("release");
static const tString SCOREBIAS ("scorebias");
@@ -294,6 +298,7 @@
s << SCOREBIAS << "\t" << scoreBias_ << "\n";
s << NAME << "\t" << name << "\n";
+ s << FILTEREDNAME << "\t" << nameForSorting << "\n";
s << TNA << "\t" << timesNotAnswered << "\n";
s << END << "\t" << "\n\n";
}
@@ -347,6 +352,8 @@
s >> timesNotAnswered;
else if (id == NAME)
name.ReadLine(s);
+ else if (id == FILTEREDNAME)
+ nameForSorting.ReadLine(s);
else
con << "Warning: unknown tag " << id << " found in server config file.\n";
}
@@ -405,19 +412,25 @@
// break;
int compare = 0;
bool previousPolling = prev->Polling();
- bool previousUnreachable = !prev->Reachable() && !previousPolling;
+ bool previousUnreachable = !prev->Reachable() || previousPolling;
bool ascendPolling = ascend->Polling();
- bool ascendUnreachable = !ascend->Reachable() && !ascendPolling;
+ bool ascendUnreachable = !ascend->Reachable() || ascendPolling;
+ // Idiots get their server removed
+ if ( !previousUnreachable && !ascendUnreachable && prev->nameForSorting == "") {
+ prev->Remove();
+ break;
+ }
+
switch ( key )
{
case KEY_NAME:
- // Unreachable servers should be displayed at the end of the list
- if ( !previousUnreachable && !ascendUnreachable ) {
- compare = tColoredString::RemoveColors(prev->name).Compare( tColoredString::RemoveColors(ascend->name), true );
+ // Unreachable servers should be displayed at the end of the list
+ if ( !previousUnreachable && !ascendUnreachable )
+ {
+ compare = prev->nameForSorting.Compare( ascend->nameForSorting, true );
}
-
break;
case KEY_PING:
if ( ascend->ping > prev->ping )
@@ -1036,7 +1049,10 @@
n->stillOnMasterServer = true;
if (n->name.Len() <= 1)
+ {
n->name << ToString( baseInfo );
+ n->nameForSorting << sn_serverNameCharacterFilter.FilterServerName( n->name, true );
+ }
// n->advancedInfoSet = false;
n->queried = 0;
@@ -2682,6 +2698,7 @@
tColoredString filteredName( sn_serverName );
filteredName.NetFilter();
name = filteredName;
+ nameForSorting = sn_serverNameCharacterFilter.FilterServerName( filteredName, false );
if ( nServerInfoAdmin::GetAdmin() )
{
@@ -2743,6 +2760,8 @@
tString oldName = name;
sn_ReadFiltered( m, name ); // get the server name
+ nameForSorting = sn_serverNameCharacterFilter.FilterServerName ( name, false );
+ // and filter it for sorting
m >> users; // get the playing users
if ( !m.End() )
@@ -2996,4 +3015,98 @@
return name;
}
+// *******************************************************************************************
+// *
+// * nServerInfoCharacterFilter
+// *
+// *******************************************************************************************
+//!
+//!
+// *******************************************************************************************
+nServerInfoCharacterFilter::nServerInfoCharacterFilter( void )
+{
+ int i;
+ filter[0] = 0;
+
+ // Delete all unknown characters
+ for (i=255; i>0; --i)
+ {
+ filter[i] = -1;
+ }
+
+ // leave as they are..
+ // numbers:
+ for (i='9'; i>='0'; --i)
+ {
+ filter[i] = i;
+ }
+ // and lowercase letters:
+ for (i='z'; i >='a'; --i)
+ {
+ filter[i] = i;
+ }
+
+ // but convert uppercase characters to lowercase
+ for (i='Z'; i>='A'; --i)
+ {
+ filter[i] = i + ('a' - 'A');
+ }
+
+ //! map umlauts and stuff to their base characters
+ SetMap(0xc0,0xc5,'a');
+ SetMap(0xd1,0xd6,'o');
+ SetMap(0xd9,0xdD,'u');
+ SetMap(0xdf,'s');
+ SetMap(0xe0,0xe5,'a');
+ SetMap(0xe8,0xeb,'e');
+ SetMap(0xec,0xef,'i');
+ SetMap(0xf0,0xf6,'o');
+ SetMap(0xf9,0xfc,'u');
+
+ // Remap l33t characters
+ SetMap('0', 'o');
+ SetMap('1', 'i');
+ SetMap('2', 'z');
+ SetMap('3', 'e');
+ SetMap('4', 'a');
+ SetMap('5', 's');
+ SetMap('6', 'g');
+ SetMap('7', 't');
+ SetMap('$', 's');
+ SetMap('+', 't');
+}
+
+// *******************************************************************************************
+// *
+// * nServerInfoCharacterFilter
+// *
+// *******************************************************************************************
+//!
+//!
+// *******************************************************************************************
+
+tString nServerInfoCharacterFilter::FilterServerName( tString s, bool IP )
+{
+ // Remove colors
+ s = tColoredString::RemoveColors( s );
+
+ // Map characters accordingly to the filter
+ int len = s.Len();
+ tString out;
+ int c;
+ for ( int i = 0; i < len; i++ )
+ {
+ if( IP && ( ( s[i] <= '9' && s[i] >= '0' ) || s[i] == '.' || s[i] == ':' ) )
+ {
+ out << s[i];
+ }
+ else if ( ( c = Filter( s[i] ) ) >= 0 )
+ {
+ out << (char) c;
+ }
+ }
+// std::cout << "Filtered name for "<< ( IP? "IP ":"" ) << "'" << s << "' : '" << out << "'\n";
+ return out;
+}
+
Modified: armagetronad/trunk/armagetronad/src/network/nServerInfo.h
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nServerInfo.h 2008-11-28 21:44:18 UTC (rev 8603)
+++ armagetronad/trunk/armagetronad/src/network/nServerInfo.h 2008-11-28 21:54:07 UTC (rev 8604)
@@ -139,6 +139,8 @@
int users; // number of users online
int maxUsers_; // maximum number of users allowed
+ tString nameForSorting; //!< Name used when sorting servers.
+
tString userNames_; // names of the connected users
tString userGlobalIDs_; // IDs of the connected users
tString userNamesOneLine_;// names of the connected users in one line
@@ -192,6 +194,7 @@
static nServerInfo *GetFirstServer(); // get the first (best) server
static void Sort( PrimaryKey key ); // sort the servers by score
+ static tString SortableName( const char * ); // gives a sanitized name for sorting
static void CalcScoreAll(); // calculate the score for all servers
static void DeleteAll(bool autosave=true); // delete all server infos
@@ -335,6 +338,13 @@
static nServerInfoAdmin* GetAdmin();
};
+class nServerInfoCharacterFilter: public tCharacterFilter
+{
+public:
+ nServerInfoCharacterFilter( void );
+ tString FilterServerName( tString, bool );
+};
+
// *******************************************************************************************
// *
// * GetName
Modified: armagetronad/trunk/armagetronad/src/tools/tString.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 21:44:18 UTC (rev 8603)
+++ armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 21:54:07 UTC (rev 8604)
@@ -225,72 +225,6 @@
// char st_stringOutputBuffer[tMAX_STRING_OUTPUT];
-// filters illegal characters
-class tCharacterFilter
-{
-public:
- tCharacterFilter()
- {
- int i;
- filter[0]=0;
-
- // map all unknown characters to underscores
- for (i=255; i>=0; --i)
- {
- filter[i] = '_';
- }
-
- // leave ASCII characters as they are
- // for (i=127; i>=32; --i)
- // no, leave all ISO Latin 1 characters as they are
- for (i=255; i>=32; --i)
- {
- filter[i] = i;
- }
-
- // map return and tab to space
- SetMap('\n',' ');
- SetMap('\t',' ');
-
- //! map umlauts and stuff to their base characters
- /*
- SetMap(0xc0,0xc5,'A');
- SetMap(0xd1,0xd6,'O');
- SetMap(0xd9,0xdD,'U');
- SetMap(0xdf,'s');
- SetMap(0xe0,0xe5,'a');
- SetMap(0xe8,0xeb,'e');
- SetMap(0xec,0xef,'i');
- SetMap(0xf0,0xf6,'o');
- SetMap(0xf9,0xfc,'u');
- */
-
- //!todo: map weird chars
- // make this data driven.
- }
-
- char Filter( unsigned char in )
- {
- return filter[ static_cast< unsigned int >( in )];
- }
-private:
- void SetMap( int in1, int in2, unsigned char out)
- {
- tASSERT( in2 <= 0xff );
- tASSERT( 0 <= in1 );
- tASSERT( in1 < in2 );
- for( int i = in2; i >= in1; --i )
- filter[ i ] = out;
- }
-
- void SetMap( unsigned char in, unsigned char out)
- {
- filter[ static_cast< unsigned int >( in ) ] = out;
- }
-
- char filter[256];
-};
-
// *******************************************************************************
// *
// * tString
@@ -1537,22 +1471,22 @@
// skip color codes
if (*c=='0' && len >= 2 && c[1]=='x')
{
- if( len >= 8 && darkonly && strncmp( c, "0xRESETT", 8 ) != 0 )
- {
- tColor colorToFilter;
- colorToFilter = tColor( c );
- if ( !colorToFilter.IsDark() )
- {
- ret << c[0] << c[1] << c[2] << c[3] << c[4] << c[5] << c[6] << c[7];
- }
- else
- {
+ if( len >= 8 && darkonly && strncmp( c, "0xRESETT", 8 ) != 0 )
+ {
+ tColor colorToFilter;
+ colorToFilter = tColor( c );
+ if ( !colorToFilter.IsDark() )
+ {
+ ret << c[0] << c[1] << c[2] << c[3] << c[4] << c[5] << c[6] << c[7];
+ }
+ else
+ {
removed = true;
- }
- c += 8;
- len -= 8;
- }
- else if( len >= 8 )
+ }
+ c += 8;
+ len -= 8;
+ }
+ else if( len >= 8 )
{
c += 8;
len -= 8;
@@ -1563,7 +1497,7 @@
// skip incomplete color codes, too
return RemoveColors( ret, darkonly );
}
- // st_Breakpoint();
+ // st_Breakpoint();
}
else
{
@@ -1681,7 +1615,7 @@
void tString::NetFilter( void )
{
- static tCharacterFilter filter;
+ static tNetCharacterFilter filter;
// run through string
for( int i = Len()-2; i>=0; --i )
@@ -2272,3 +2206,118 @@
toTransform[i] = toupper( toTransform[i] );
}
}
+
+// **********************************************************************
+// *
+// * Filter
+// *
+// **********************************************************************
+//!
+//! @param in Character to process filters on
+//!
+// **********************************************************************
+
+char tCharacterFilter::Filter( unsigned char in )
+{
+ if ( filter[ static_cast< unsigned int >( in )] < 0 )
+ return -1;
+ else
+ return filter[ static_cast< unsigned int >( in )];
+}
+
+// **********************************************************************
+// *
+// * Filter
+// *
+// **********************************************************************
+//!
+//! @param in Character to process filters on
+//!
+// **********************************************************************
+
+tString tCharacterFilter::FilterString( tString & s )
+{
+ int len = s.Len();
+ tString out;
+ int c;
+ for ( int i = 0; i < len; i++ )
+ {
+ c = Filter( s[i] );
+ if ( c >= 0 )
+ {
+ out << (char) c;
+ }
+ }
+ return out;
+}
+
+// **********************************************************************
+// *
+// * SetMap
+// *
+// **********************************************************************
+//!
+//! @param in1 Begin of the character range to process filters on
+//! @param in2 End of the character range
+//! @param out Filtered character
+//!
+// **********************************************************************
+
+void tCharacterFilter::SetMap( int in1, int in2, char out)
+{
+ tASSERT( in2 <= 0xff );
+ tASSERT( 0 <= in1 );
+ tASSERT( in1 < in2 );
+ for( int i = in2; i >= in1; --i )
+ filter[ i ] = out;
+}
+
+// **********************************************************************
+// *
+// * SetMap
+// *
+// **********************************************************************
+//!
+//! @param in Character to process filters on
+//! @param out Filtered character
+//!
+// **********************************************************************
+
+void tCharacterFilter::SetMap( unsigned char in, char out)
+{
+ filter[ static_cast< unsigned int >( in ) ] = out;
+}
+
+// **********************************************************************
+// *
+// * tNetCharacterFilter
+// *
+// **********************************************************************
+//!
+//!
+// **********************************************************************
+
+tNetCharacterFilter::tNetCharacterFilter ( void )
+{
+ int i;
+ filter[0]=0;
+
+ // map all unknown characters to underscores
+ for (i=255; i>=0; --i)
+ {
+ filter[i] = '_';
+ }
+
+ // no, leave all ISO Latin 1 characters as they are
+ for (i=255; i>=32; --i)
+ {
+ filter[i] = i;
+ }
+
+ // map return and tab to space
+ SetMap('\n',' ');
+ SetMap('\t',' ');
+
+
+}
+
Modified: armagetronad/trunk/armagetronad/src/tools/tString.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tString.h 2008-11-28 21:44:18 UTC (rev 8603)
+++ armagetronad/trunk/armagetronad/src/tools/tString.h 2008-11-28 21:54:07 UTC (rev 8604)
@@ -288,6 +288,27 @@
}
#endif
+class tCharacterFilter
+{
+public:
+ char Filter ( unsigned char );
+ tString FilterString ( tString & );
+
+protected:
+ tCharacterFilter ( void ) {} // To use a tCharacterFilter, make your own class herit of this one and define the constructor
+
+ void SetMap ( int, int, char );
+ void SetMap ( unsigned char, char );
+
+ char filter[256];
+};
+
+class tNetCharacterFilter: public tCharacterFilter
+{
+public:
+ tNetCharacterFilter ( void );
+};
+
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-11-28 21:56:20
|
Revision: 8606
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8606&view=rev
Author: bazaarmagetron
Date: 2008-11-28 21:56:17 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
epsy: have ePlayerCharacterFilter being a tCharacterFilter, too
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-10-27 21:35:05.845999956 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
+ timestamp: 2008-10-27 21:47:27.894999981 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-11-28 21:55:16 UTC (rev 8605)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-11-28 21:56:17 UTC (rev 8606)
@@ -7748,112 +7748,89 @@
return true;
}
+class ePlayerCharacterFilter :public tCharacterFilter
+{
+public:
+ ePlayerCharacterFilter( void );
+};
// filters illegal player characters
-class ePlayerCharacterFilter
+ePlayerCharacterFilter::ePlayerCharacterFilter()
{
-public:
- ePlayerCharacterFilter()
- {
- int i;
- filter[0]=0;
+ int i;
+ filter[0]=0;
- // map all unknown characters to underscores
- for (i=255; i>0; --i)
- {
- filter[i] = '_';
- }
-
- // leave ASCII characters as they are
- for (i=126; i>32; --i)
- {
- filter[i] = i;
- }
- // but convert uppercase characters to lowercase
- for (i='Z'; i>='A'; --i)
- {
- filter[i] = i + ('a' - 'A');
- }
-
- //! map umlauts and stuff to their base characters
- SetMap(0xc0,0xc5,'a');
- SetMap(0xd1,0xd6,'o');
- SetMap(0xd9,0xdD,'u');
- SetMap(0xdf,'s');
- SetMap(0xe0,0xe5,'a');
- SetMap(0xe8,0xeb,'e');
- SetMap(0xec,0xef,'i');
- SetMap(0xf0,0xf6,'o');
- SetMap(0xf9,0xfc,'u');
-
- // ok, some of those are a bit questionable, but still better than _...
- SetMap(161,'!');
- SetMap(162,'c');
- SetMap(163,'l');
- SetMap(165,'y');
- SetMap(166,'|');
- SetMap(167,'s');
- SetMap(168,'"');
- SetMap(169,'c');
- SetMap(170,'a');
- SetMap(171,'"');
- SetMap(172,'!');
- SetMap(174,'r');
- SetMap(176,'o');
- SetMap(177,'+');
- SetMap(178,'2');
- SetMap(179,'3');
- SetMap(182,'p');
- SetMap(183,'.');
- SetMap(185,'1');
- SetMap(187,'"');
- SetMap(198,'a');
- SetMap(199,'c');
- SetMap(208,'d');
- SetMap(209,'n');
- SetMap(215,'x');
- SetMap(216,'o');
- SetMap(221,'y');
- SetMap(222,'p');
- SetMap(231,'c');
- SetMap(241,'n');
- SetMap(247,'/');
- SetMap(248,'o');
- SetMap(253,'y');
- SetMap(254,'p');
- SetMap(255,'y');
-
- //map 0 to o because they look similar
- SetMap('0','o');
-
- // TODO: make this data driven.
+ // map all unknown characters to underscores
+ for (i=255; i>0; --i)
+ {
+ filter[i] = '_';
}
- char Filter( unsigned char in )
+ // leave ASCII characters as they are
+ for (i=126; i>32; --i)
{
- if ( filter[ static_cast< unsigned int >( in )] < 0 )
- return '_';
- else
- return filter[ static_cast< unsigned int >( in )];
+ filter[i] = i;
}
-private:
- void SetMap( int in1, int in2, unsigned char out)
+ // but convert uppercase characters to lowercase
+ for (i='Z'; i>='A'; --i)
{
- tASSERT( in2 <= 0xff );
- tASSERT( 0 <= in1 );
- tASSERT( in1 < in2 );
- for( int i = in2; i >= in1; --i )
- filter[ i ] = out;
+ filter[i] = i + ('a' - 'A');
}
- void SetMap( unsigned char in, unsigned char out)
- {
- filter[ static_cast< unsigned int >( in ) ] = out;
- }
+ //! map umlauts and stuff to their base characters
+ SetMap(0xc0,0xc5,'a');
+ SetMap(0xd1,0xd6,'o');
+ SetMap(0xd9,0xdD,'u');
+ SetMap(0xdf,'s');
+ SetMap(0xe0,0xe5,'a');
+ SetMap(0xe8,0xeb,'e');
+ SetMap(0xec,0xef,'i');
+ SetMap(0xf0,0xf6,'o');
+ SetMap(0xf9,0xfc,'u');
- char filter[256];
-};
+ // ok, some of those are a bit questionable, but still better than _...
+ SetMap(161,'!');
+ SetMap(162,'c');
+ SetMap(163,'l');
+ SetMap(165,'y');
+ SetMap(166,'|');
+ SetMap(167,'s');
+ SetMap(168,'"');
+ SetMap(169,'c');
+ SetMap(170,'a');
+ SetMap(171,'"');
+ SetMap(172,'!');
+ SetMap(174,'r');
+ SetMap(176,'o');
+ SetMap(177,'+');
+ SetMap(178,'2');
+ SetMap(179,'3');
+ SetMap(182,'p');
+ SetMap(183,'.');
+ SetMap(185,'1');
+ SetMap(187,'"');
+ SetMap(198,'a');
+ SetMap(199,'c');
+ SetMap(208,'d');
+ SetMap(209,'n');
+ SetMap(215,'x');
+ SetMap(216,'o');
+ SetMap(221,'y');
+ SetMap(222,'p');
+ SetMap(231,'c');
+ SetMap(241,'n');
+ SetMap(247,'/');
+ SetMap(248,'o');
+ SetMap(253,'y');
+ SetMap(254,'p');
+ SetMap(255,'y');
+ //map 0 to o because they look similar
+ SetMap('0','o');
+
+ // TODO: make this data driven.
+}
+
static bool se_IsUnderscore( char c )
{
return c == '_';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-11-28 21:57:20
|
Revision: 8607
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8607&view=rev
Author: bazaarmagetron
Date: 2008-11-28 21:57:16 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
epsy: Fixed spaces appearing in server IPs
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
armagetronad/trunk/armagetronad/src/tools/tString.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-10-27 21:47:27.894999981 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
+ timestamp: 2008-10-28 19:07:34.404000044 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-11-28 21:56:17 UTC (rev 8606)
+++ armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-11-28 21:57:16 UTC (rev 8607)
@@ -3092,7 +3092,7 @@
s = tColoredString::RemoveColors( s );
// Map characters accordingly to the filter
- int len = s.Len();
+ int len = s.Len() -1;
tString out;
int c;
for ( int i = 0; i < len; i++ )
Modified: armagetronad/trunk/armagetronad/src/tools/tString.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 21:56:17 UTC (rev 8606)
+++ armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 21:57:16 UTC (rev 8607)
@@ -1105,20 +1105,8 @@
tString::CHAR & tString::operator []( size_t i )
{
- while( i >= size() )
- {
- *this += ' ';
-#ifdef DEBUG
- static bool warn = true;
- if( warn )
- {
- warn = false;
- tERR_MESSAGE("Auto-expanding string, this functionality will go away.");
- }
-#endif
- }
-
- return BASE::operator[](i);
+ tASSERT( i <= size() );
+ return BASE::operator[]( i );
}
// *******************************************************************************
@@ -1618,7 +1606,7 @@
static tNetCharacterFilter filter;
// run through string
- filter.FilterString( *this );
+ *this = filter.FilterString( *this );
}
bool st_colorStrings=true;
@@ -2231,13 +2219,13 @@
tString tCharacterFilter::FilterString( tString & s )
{
- int len = s.Len();
+ int len = s.Len() -1;
tString out;
int c;
for ( int i = 0; i < len; i++ )
{
c = Filter( s[i] );
- if ( c >= 0 )
+ if ( c > 0 )
{
out << (char) c;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-11-28 22:00:58
|
Revision: 8608
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8608&view=rev
Author: bazaarmagetron
Date: 2008-11-28 22:00:55 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
epsy: If you have headaches because of type conversion, don't do conversions.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
armagetronad/trunk/armagetronad/src/tools/tString.cpp
armagetronad/trunk/armagetronad/src/tools/tString.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-10-28 19:07:34.404000044 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
+ timestamp: 2008-10-28 23:40:44.974999905 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-11-28 21:57:16 UTC (rev 8607)
+++ armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-11-28 22:00:55 UTC (rev 8608)
@@ -3026,13 +3026,13 @@
nServerInfoCharacterFilter::nServerInfoCharacterFilter( void )
{
- int i;
+ unsigned char i;
filter[0] = 0;
// Delete all unknown characters
- for (i=255; i>0; --i)
+ for (i=255; i > 0; --i)
{
- filter[i] = -1;
+ filter[i] = 0x7f;
}
// leave as they are..
@@ -3094,19 +3094,19 @@
// Map characters accordingly to the filter
int len = s.Len() -1;
tString out;
- int c;
+ char c;
for ( int i = 0; i < len; i++ )
{
- if( IP && ( ( s[i] <= '9' && s[i] >= '0' ) || s[i] == '.' || s[i] == ':' ) )
+ if( IP && ( ( s[i] <= '9' && s[i] != 0x7f ) || s[i] == '.' || s[i] == ':' ) )
{
out << s[i];
}
- else if ( ( c = Filter( s[i] ) ) >= 0 )
+ else if ( (int) ( c = Filter( s[i] ) ) != 0x7f )
{
out << (char) c;
}
}
-// std::cout << "Filtered name for "<< ( IP? "IP ":"" ) << "'" << s << "' : '" << out << "'\n";
+ // std::cout << "Filtered name for "<< ( IP? "IP ":"" ) << "'" << s << "' : '" << out << "'\n";
return out;
}
Modified: armagetronad/trunk/armagetronad/src/tools/tString.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 21:57:16 UTC (rev 8607)
+++ armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 22:00:55 UTC (rev 8608)
@@ -2201,10 +2201,7 @@
char tCharacterFilter::Filter( unsigned char in )
{
- if ( filter[ static_cast< unsigned int >( in )] < 0 )
- return -1;
- else
- return filter[ static_cast< unsigned int >( in )];
+ return filter[ in ];
}
// **********************************************************************
@@ -2221,15 +2218,18 @@
{
int len = s.Len() -1;
tString out;
- int c;
+ unsigned char c;
for ( int i = 0; i < len; i++ )
{
c = Filter( s[i] );
- if ( c > 0 )
+ if ( ( c ) != 0x7f ) // If it's a del character, that means we want to strip it
{
- out << (char) c;
+ out << c;
}
+ std::cout << "'" << (unsigned char) c << "'(" << int( c ) << ")\n";
}
+ // std::cout << "Filtered name for " /*<< ( IP? "IP ":"" )*/ << "'" << s << "' : '" << out << "'\n";
+
return out;
}
@@ -2245,12 +2245,12 @@
//!
// **********************************************************************
-void tCharacterFilter::SetMap( int in1, int in2, char out)
+void tCharacterFilter::SetMap( unsigned char in1, unsigned char in2, unsigned char out)
{
tASSERT( in2 <= 0xff );
tASSERT( 0 <= in1 );
tASSERT( in1 < in2 );
- for( int i = in2; i >= in1; --i )
+ for( unsigned char i = in2; i >= in1; --i )
filter[ i ] = out;
}
@@ -2265,9 +2265,9 @@
//!
// **********************************************************************
-void tCharacterFilter::SetMap( unsigned char in, char out)
+void tCharacterFilter::SetMap( unsigned char in, unsigned char out )
{
- filter[ static_cast< unsigned int >( in ) ] = out;
+ filter[ in ] = out;
}
// **********************************************************************
@@ -2281,17 +2281,18 @@
tNetCharacterFilter::tNetCharacterFilter ( void )
{
- int i;
+ unsigned char i;
filter[0]=0;
// map all unknown characters to underscores
- for (i=255; i>=0; --i)
+ for (i=255; i > 0; i--)
{
+ std::cout << i << "(" << (int) i << ")\n";
filter[i] = '_';
}
// no, leave all ISO Latin 1 characters as they are
- for (i=255; i>=32; --i)
+ for (i=255; i >= 32; --i)
{
filter[i] = i;
}
Modified: armagetronad/trunk/armagetronad/src/tools/tString.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tString.h 2008-11-28 21:57:16 UTC (rev 8607)
+++ armagetronad/trunk/armagetronad/src/tools/tString.h 2008-11-28 22:00:55 UTC (rev 8608)
@@ -297,8 +297,8 @@
protected:
tCharacterFilter ( void ) {} // To use a tCharacterFilter, make your own class herit of this one and define the constructor
- void SetMap ( int, int, char );
- void SetMap ( unsigned char, char );
+ void SetMap ( unsigned char, unsigned char, unsigned char );
+ void SetMap ( unsigned char, unsigned char );
char filter[256];
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-11-28 22:04:46
|
Revision: 8609
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8609&view=rev
Author: bazaarmagetron
Date: 2008-11-28 22:04:36 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
epsy: remove debug output and add ?\194?\176 to l33t filters
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
armagetronad/trunk/armagetronad/src/tools/tString.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-10-28 23:40:44.974999905 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
+ timestamp: 2008-11-10 20:38:48.634999990 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk-armagetronad-work
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-11-28 22:00:55 UTC (rev 8608)
+++ armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-11-28 22:04:36 UTC (rev 8609)
@@ -3066,6 +3066,7 @@
// Remap l33t characters
SetMap('0', 'o');
+ SetMap(0xb0, 'o'); // °
SetMap('1', 'i');
SetMap('2', 'z');
SetMap('3', 'e');
Modified: armagetronad/trunk/armagetronad/src/tools/tString.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 22:00:55 UTC (rev 8608)
+++ armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-11-28 22:04:36 UTC (rev 8609)
@@ -2226,7 +2226,6 @@
{
out << c;
}
- std::cout << "'" << (unsigned char) c << "'(" << int( c ) << ")\n";
}
// std::cout << "Filtered name for " /*<< ( IP? "IP ":"" )*/ << "'" << s << "' : '" << out << "'\n";
@@ -2287,7 +2286,6 @@
// map all unknown characters to underscores
for (i=255; i > 0; i--)
{
- std::cout << i << "(" << (int) i << ")\n";
filter[i] = '_';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-11-28 22:06:04
|
Revision: 8610
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8610&view=rev
Author: bazaarmagetron
Date: 2008-11-28 22:05:52 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
epsy: encourage holing, not noob-pranking
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-11-10 20:38:48.634999990 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk-armagetronad-work
+ timestamp: 2008-11-14 22:22:32.186000109 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk-armagetronad-work
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-11-28 22:04:36 UTC (rev 8609)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-11-28 22:05:52 UTC (rev 8610)
@@ -1014,7 +1014,7 @@
"/me just installed this game and still doesn't know how to talk.",
"/team You all suck, I want a new team.",
"Are you the real \"Player 1\"?",
- "Shh, don't tell anyone: Press SHIFT-ESC for cheats!",
+ "Only idiots miss holes!",
NULL};
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-11 14:16:57
|
Revision: 8658
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8658&view=rev
Author: bazaarmagetron
Date: 2008-12-11 14:16:46 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
Manuel Moos: Fixed compiler warnings.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
armagetronad/trunk/armagetronad/src/tools/tString.cpp
armagetronad/trunk/armagetronad/src/tron/gServerFavorites.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-11-14 22:22:32.186000109 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk-armagetronad-work
+ timestamp: 2008-12-11 15:10:49.930999994 +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
+ 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
Modified: armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-12-11 12:26:56 UTC (rev 8657)
+++ armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-12-11 14:16:46 UTC (rev 8658)
@@ -166,9 +166,9 @@
timesNotAnswered(5),
stillOnMasterServer(false),
name(""),
- nameForSorting(""),
users(0),
maxUsers_(MAXCLIENTS),
+ nameForSorting(""),
score(-10000),
scoreBias_(0),
queryType_( QUERY_ALL )
Modified: armagetronad/trunk/armagetronad/src/tools/tString.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-12-11 12:26:56 UTC (rev 8657)
+++ armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-12-11 14:16:46 UTC (rev 8658)
@@ -2246,8 +2246,6 @@
void tCharacterFilter::SetMap( unsigned char in1, unsigned char in2, unsigned char out)
{
- tASSERT( in2 <= 0xff );
- tASSERT( 0 <= in1 );
tASSERT( in1 < in2 );
for( unsigned char i = in2; i >= in1; --i )
filter[ i ] = out;
Modified: armagetronad/trunk/armagetronad/src/tron/gServerFavorites.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gServerFavorites.cpp 2008-12-11 12:26:56 UTC (rev 8657)
+++ armagetronad/trunk/armagetronad/src/tron/gServerFavorites.cpp 2008-12-11 14:16:46 UTC (rev 8658)
@@ -247,7 +247,7 @@
// current minimal port accessible in the menu
static int sg_lowPort = gServerBrowser::lowPort;
// current language id prefix
-static char * sg_languageIDPrefix = "$bookmarks_";
+static char const * sg_languageIDPrefix = "$bookmarks_";
// yeah, this could all be more elegant.
// generates a language string item fitting the current situation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-16 22:38:21
|
Revision: 8663
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8663&view=rev
Author: bazaarmagetron
Date: 2008-12-16 22:38:10 +0000 (Tue, 16 Dec 2008)
Log Message:
-----------
da...@da...: Added LUCIFER_ALWAYS_WINS conditional
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/tron/gGame.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-11 15:10:49.930999994 +0100
committer: Manuel Moos <z-...@us...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-16 16:31:43.680000067 -0600
committer: da...@da...
properties:
branch-nick: trunk
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
+ 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
Modified: armagetronad/trunk/armagetronad/src/tron/gGame.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2008-12-16 20:46:10 UTC (rev 8662)
+++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2008-12-16 22:38:10 UTC (rev 8663)
@@ -3355,7 +3355,11 @@
// print winning message
tOutput message;
message << "$gamestate_winner_winner";
+#ifdef LUCIFER_ALWAYS_WINS
+ message << "Lucifer";
+#else
message << eTeam::teams[winner-1]->Name();
+#endif
m_Mixer->PushButton(ROUND_WINNER);
@@ -3431,7 +3435,11 @@
{
tOutput message;
+#ifdef LUCIFER_ALWAYS_WINS
+ message.SetTemplateParameter(1, "Lucifer" );
+#else
message.SetTemplateParameter(1, eTeam::teams[0]->Name() );
+#endif
message << "$gamestate_champ_center";
sn_CenterMessage(message);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2008-12-18 07:25:57
|
Revision: 8667
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8667&view=rev
Author: luke-jr
Date: 2008-12-18 07:25:54 +0000 (Thu, 18 Dec 2008)
Log Message:
-----------
Remove GPL-incompatible Bitstream Vera font (we have our own now anyway)
Modified Paths:
--------------
armagetronad/trunk/armagetronad/AUTHORS
Removed Paths:
-------------
armagetronad/trunk/armagetronad/textures/font.ttf
Modified: armagetronad/trunk/armagetronad/AUTHORS
===================================================================
--- armagetronad/trunk/armagetronad/AUTHORS 2008-12-18 07:24:48 UTC (rev 8666)
+++ armagetronad/trunk/armagetronad/AUTHORS 2008-12-18 07:25:54 UTC (rev 8667)
@@ -99,9 +99,3 @@
Yan Olliver
Mathematical expression parser
-
-External resources
-==================
-
-Bitstream
- default font file
Deleted: armagetronad/trunk/armagetronad/textures/font.ttf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-20 09:05:16
|
Revision: 8670
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8670&view=rev
Author: bazaarmagetron
Date: 2008-12-20 09:05:08 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: add missing files
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-16 16:31:43.680000067 -0600
committer: da...@da...
properties:
branch-nick: trunk
+ timestamp: 2008-12-20 03:46:35.864000082 -0500
committer: Daniel Lee Harple <lee...@gm...>
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-18 23:54:46 UTC (rev 8669)
+++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 09:05:08 UTC (rev 8670)
@@ -10,6 +10,18 @@
8CBA60B1089F00F2007E21DC /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CBA60B0089F00F2007E21DC /* OpenGL.framework */; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
9B61EBC30B5FEF010018DEA7 /* scripts in Resources */ = {isa = PBXBuildFile; fileRef = 9B61EBBC0B5FEF010018DEA7 /* scripts */; };
+ 9B7CFE190EFCE74700126634 /* tResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B7CFE130EFCE74700126634 /* tResource.cpp */; };
+ 9B7CFE1A0EFCE74700126634 /* tResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B7CFE140EFCE74700126634 /* tResource.h */; };
+ 9B7CFE1B0EFCE74700126634 /* tResourceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B7CFE150EFCE74700126634 /* tResourceManager.cpp */; };
+ 9B7CFE1C0EFCE74700126634 /* tResourceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B7CFE160EFCE74700126634 /* tResourceManager.h */; };
+ 9B7CFE1D0EFCE74700126634 /* tResourceType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B7CFE170EFCE74700126634 /* tResourceType.cpp */; };
+ 9B7CFE1E0EFCE74700126634 /* tResourceType.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B7CFE180EFCE74700126634 /* tResourceType.h */; };
+ 9B7CFE1F0EFCE74700126634 /* tResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B7CFE130EFCE74700126634 /* tResource.cpp */; };
+ 9B7CFE200EFCE74700126634 /* tResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B7CFE140EFCE74700126634 /* tResource.h */; };
+ 9B7CFE210EFCE74700126634 /* tResourceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B7CFE150EFCE74700126634 /* tResourceManager.cpp */; };
+ 9B7CFE220EFCE74700126634 /* tResourceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B7CFE160EFCE74700126634 /* tResourceManager.h */; };
+ 9B7CFE230EFCE74700126634 /* tResourceType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B7CFE170EFCE74700126634 /* tResourceType.cpp */; };
+ 9B7CFE240EFCE74700126634 /* tResourceType.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B7CFE180EFCE74700126634 /* tResourceType.h */; };
9B83FE950B12161600878E8A /* Growl-WithInstaller.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B83FE940B12161600878E8A /* Growl-WithInstaller.framework */; };
9B83FF0F0B121B3100878E8A /* Growl-WithInstaller.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 9B83FE940B12161600878E8A /* Growl-WithInstaller.framework */; };
9BB5B9280D84605700BF5F1C /* InfoPlist.strings.in in Resources */ = {isa = PBXBuildFile; fileRef = 9BB5B9260D84605700BF5F1C /* InfoPlist.strings.in */; };
@@ -148,8 +160,6 @@
9BB7B83F0D830423004FE8C3 /* tRandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7D20D830422004FE8C3 /* tRandom.cpp */; };
9BB7B8420D830423004FE8C3 /* tRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7D50D830422004FE8C3 /* tRecorder.cpp */; };
9BB7B8440D830423004FE8C3 /* tRecorderInternal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7D70D830422004FE8C3 /* tRecorderInternal.cpp */; };
- 9BB7B8470D830423004FE8C3 /* tResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7DA0D830422004FE8C3 /* tResource.cpp */; };
- 9BB7B8490D830423004FE8C3 /* tResourceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7DC0D830422004FE8C3 /* tResourceManager.cpp */; };
9BB7B84B0D830423004FE8C3 /* tRing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7DE0D830422004FE8C3 /* tRing.cpp */; };
9BB7B84D0D830423004FE8C3 /* tRuby.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7E00D830422004FE8C3 /* tRuby.cpp */; };
9BB7B84F0D830423004FE8C3 /* tSafePTR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7E20D830422004FE8C3 /* tSafePTR.cpp */; };
@@ -190,8 +200,6 @@
9BB7B8A90D830423004FE8C3 /* tRandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7D20D830422004FE8C3 /* tRandom.cpp */; };
9BB7B8AC0D830423004FE8C3 /* tRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7D50D830422004FE8C3 /* tRecorder.cpp */; };
9BB7B8AE0D830423004FE8C3 /* tRecorderInternal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7D70D830422004FE8C3 /* tRecorderInternal.cpp */; };
- 9BB7B8B10D830423004FE8C3 /* tResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7DA0D830422004FE8C3 /* tResource.cpp */; };
- 9BB7B8B30D830423004FE8C3 /* tResourceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7DC0D830422004FE8C3 /* tResourceManager.cpp */; };
9BB7B8B50D830423004FE8C3 /* tRing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7DE0D830422004FE8C3 /* tRing.cpp */; };
9BB7B8B70D830423004FE8C3 /* tRuby.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7E00D830422004FE8C3 /* tRuby.cpp */; };
9BB7B8B90D830423004FE8C3 /* tSafePTR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B7E20D830422004FE8C3 /* tSafePTR.cpp */; };
@@ -408,6 +416,12 @@
9B61EBBC0B5FEF010018DEA7 /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = scripts; path = ../scripts; sourceTree = SOURCE_ROOT; };
9B77E6C80D8618B90022FDF2 /* xcode.rake */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = xcode.rake; sourceTree = "<group>"; };
9B77E6C90D8618B90022FDF2 /* rakefile.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = rakefile.rb; sourceTree = "<group>"; };
+ 9B7CFE130EFCE74700126634 /* tResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tResource.cpp; sourceTree = "<group>"; };
+ 9B7CFE140EFCE74700126634 /* tResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tResource.h; sourceTree = "<group>"; };
+ 9B7CFE150EFCE74700126634 /* tResourceManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tResourceManager.cpp; sourceTree = "<group>"; };
+ 9B7CFE160EFCE74700126634 /* tResourceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tResourceManager.h; sourceTree = "<group>"; };
+ 9B7CFE170EFCE74700126634 /* tResourceType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tResourceType.cpp; sourceTree = "<group>"; };
+ 9B7CFE180EFCE74700126634 /* tResourceType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tResourceType.h; sourceTree = "<group>"; };
9B83FE940B12161600878E8A /* Growl-WithInstaller.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "Growl-WithInstaller.framework"; path = "/Library/Frameworks/ArmagetronAdvanced/current/Growl-WithInstaller.framework"; sourceTree = "<absolute>"; };
9B9E56300D81D962008DD17D /* shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = shared.xcconfig; sourceTree = "<group>"; };
9BB5B9240D84604400BF5F1C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../src/macosx/Info.plist; sourceTree = SOURCE_ROOT; };
@@ -589,10 +603,6 @@
9BB7B7D70D830422004FE8C3 /* tRecorderInternal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tRecorderInternal.cpp; sourceTree = "<group>"; };
9BB7B7D80D830422004FE8C3 /* tRecorderInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tRecorderInternal.h; sourceTree = "<group>"; };
9BB7B7D90D830422004FE8C3 /* tReferenceHolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tReferenceHolder.h; sourceTree = "<group>"; };
- 9BB7B7DA0D830422004FE8C3 /* tResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tResource.cpp; sourceTree = "<group>"; };
- 9BB7B7DB0D830422004FE8C3 /* tResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tResource.h; sourceTree = "<group>"; };
- 9BB7B7DC0D830422004FE8C3 /* tResourceManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tResourceManager.cpp; sourceTree = "<group>"; };
- 9BB7B7DD0D830422004FE8C3 /* tResourceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tResourceManager.h; sourceTree = "<group>"; };
9BB7B7DE0D830422004FE8C3 /* tRing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tRing.cpp; sourceTree = "<group>"; };
9BB7B7DF0D830422004FE8C3 /* tRing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tRing.h; sourceTree = "<group>"; };
9BB7B7E00D830422004FE8C3 /* tRuby.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tRuby.cpp; sourceTree = "<group>"; };
@@ -822,6 +832,20 @@
path = rakelib;
sourceTree = "<group>";
};
+ 9B7CFE120EFCE74700126634 /* resource */ = {
+ isa = PBXGroup;
+ children = (
+ 9B7CFE130EFCE74700126634 /* tResource.cpp */,
+ 9B7CFE140EFCE74700126634 /* tResource.h */,
+ 9B7CFE150EFCE74700126634 /* tResourceManager.cpp */,
+ 9B7CFE160EFCE74700126634 /* tResourceManager.h */,
+ 9B7CFE170EFCE74700126634 /* tResourceType.cpp */,
+ 9B7CFE180EFCE74700126634 /* tResourceType.h */,
+ );
+ name = resource;
+ path = ../src/resource;
+ sourceTree = SOURCE_ROOT;
+ };
9BB7B5A30D8302DF004FE8C3 /* Source */ = {
isa = PBXGroup;
children = (
@@ -1079,6 +1103,7 @@
9BB7B7A00D830422004FE8C3 /* tools */ = {
isa = PBXGroup;
children = (
+ 9B7CFE120EFCE74700126634 /* resource */,
9BB7B7A30D830422004FE8C3 /* tArray.cpp */,
9BB7B7A40D830422004FE8C3 /* tArray.h */,
9BB7B7A50D830422004FE8C3 /* tCallback.cpp */,
@@ -1134,10 +1159,6 @@
9BB7B7D70D830422004FE8C3 /* tRecorderInternal.cpp */,
9BB7B7D80D830422004FE8C3 /* tRecorderInternal.h */,
9BB7B7D90D830422004FE8C3 /* tReferenceHolder.h */,
- 9BB7B7DA0D830422004FE8C3 /* tResource.cpp */,
- 9BB7B7DB0D830422004FE8C3 /* tResource.h */,
- 9BB7B7DC0D830422004FE8C3 /* tResourceManager.cpp */,
- 9BB7B7DD0D830422004FE8C3 /* tResourceManager.h */,
9BB7B7DE0D830422004FE8C3 /* tRing.cpp */,
9BB7B7DF0D830422004FE8C3 /* tRing.h */,
9BB7B7E00D830422004FE8C3 /* tRuby.cpp */,
@@ -1357,6 +1378,9 @@
files = (
9BB7BA120D8304FD004FE8C3 /* aa_config.h in Headers */,
9BCBE30D0D922EAE0022855B /* AAPaste.h in Headers */,
+ 9B7CFE1A0EFCE74700126634 /* tResource.h in Headers */,
+ 9B7CFE1C0EFCE74700126634 /* tResourceManager.h in Headers */,
+ 9B7CFE1E0EFCE74700126634 /* tResourceType.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1366,6 +1390,9 @@
files = (
9BB7BA240D830669004FE8C3 /* aa_config.h in Headers */,
9BCBE30F0D922EAE0022855B /* AAPaste.h in Headers */,
+ 9B7CFE200EFCE74700126634 /* tResource.h in Headers */,
+ 9B7CFE220EFCE74700126634 /* tResourceManager.h in Headers */,
+ 9B7CFE240EFCE74700126634 /* tResourceType.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1593,8 +1620,6 @@
9BB7B8A90D830423004FE8C3 /* tRandom.cpp in Sources */,
9BB7B8AC0D830423004FE8C3 /* tRecorder.cpp in Sources */,
9BB7B8AE0D830423004FE8C3 /* tRecorderInternal.cpp in Sources */,
- 9BB7B8B10D830423004FE8C3 /* tResource.cpp in Sources */,
- 9BB7B8B30D830423004FE8C3 /* tResourceManager.cpp in Sources */,
9BB7B8B50D830423004FE8C3 /* tRing.cpp in Sources */,
9BB7B8B70D830423004FE8C3 /* tRuby.cpp in Sources */,
9BB7B8B90D830423004FE8C3 /* tSafePTR.cpp in Sources */,
@@ -1662,6 +1687,9 @@
9BB7BA060D830473004FE8C3 /* uMenu.cpp in Sources */,
9BCBDE440D91F7F30022855B /* tColor.cpp in Sources */,
9BCBE3100D922EAE0022855B /* AAPaste.cpp in Sources */,
+ 9B7CFE1F0EFCE74700126634 /* tResource.cpp in Sources */,
+ 9B7CFE210EFCE74700126634 /* tResourceManager.cpp in Sources */,
+ 9B7CFE230EFCE74700126634 /* tResourceType.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1748,8 +1776,6 @@
9BB7B83F0D830423004FE8C3 /* tRandom.cpp in Sources */,
9BB7B8420D830423004FE8C3 /* tRecorder.cpp in Sources */,
9BB7B8440D830423004FE8C3 /* tRecorderInternal.cpp in Sources */,
- 9BB7B8470D830423004FE8C3 /* tResource.cpp in Sources */,
- 9BB7B8490D830423004FE8C3 /* tResourceManager.cpp in Sources */,
9BB7B84B0D830423004FE8C3 /* tRing.cpp in Sources */,
9BB7B84D0D830423004FE8C3 /* tRuby.cpp in Sources */,
9BB7B84F0D830423004FE8C3 /* tSafePTR.cpp in Sources */,
@@ -1817,6 +1843,9 @@
9BB7BA000D830473004FE8C3 /* uMenu.cpp in Sources */,
9BCBDE120D91F6D90022855B /* tColor.cpp in Sources */,
9BCBE30E0D922EAE0022855B /* AAPaste.cpp in Sources */,
+ 9B7CFE190EFCE74700126634 /* tResource.cpp in Sources */,
+ 9B7CFE1B0EFCE74700126634 /* tResourceManager.cpp in Sources */,
+ 9B7CFE1D0EFCE74700126634 /* tResourceType.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1843,10 +1872,10 @@
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../Library/Frameworks\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = "$(SHARED_HEADER_SEARCH_PATHS)";
INSTALL_PATH = "$(HOME)/bin";
LIBRARY_SEARCH_PATHS = "$(SHARED_LIBRARY_SEARCH_PATHS)";
- OPTIMIZATION_CFLAGS = "-O0";
OTHER_CPLUSPLUSFLAGS = "$(SHARED_OTHER_CPLUSPLUSFLAGS)";
OTHER_LDFLAGS = "$(SHARED_OTHER_LDFLAGS)";
OTHER_REZFLAGS = "";
@@ -1870,10 +1899,10 @@
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../Library/Frameworks\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 2;
HEADER_SEARCH_PATHS = "$(SHARED_HEADER_SEARCH_PATHS)";
INSTALL_PATH = "$(HOME)/bin";
LIBRARY_SEARCH_PATHS = "$(SHARED_LIBRARY_SEARCH_PATHS)";
- OPTIMIZATION_CFLAGS = "-O2";
OTHER_CPLUSPLUSFLAGS = "$(SHARED_OTHER_CPLUSPLUSFLAGS)";
OTHER_LDFLAGS = "$(SHARED_OTHER_LDFLAGS)";
OTHER_REZFLAGS = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-20 09:05:55
|
Revision: 8671
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8671&view=rev
Author: bazaarmagetron
Date: 2008-12-20 09:05:52 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Fixed build-type for bzr branches.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-20 03:46:35.864000082 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-20 03:50:46.641999960 -0500
committer: Daniel Lee Harple <lee...@gm...>
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 09:05:08 UTC (rev 8670)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 09:05:52 UTC (rev 8671)
@@ -44,7 +44,7 @@
DEDICATED ? "" : PRODUCT_NAME + (ENV["WRAPPER_SUFFIX"] || "") + "/Contents/Resources"
].join("/")
- BUILD_TYPE = File.exists?(src_path(".svn")) ? :development : :release
+ BUILD_TYPE = [src_path(".svn"), src_path(".bzr")].any? { |f| File.exists?(f) } ? :development : :release
TAG_MAPPINGS = {
"version" => version(),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-20 09:06:40
|
Revision: 8672
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8672&view=rev
Author: bazaarmagetron
Date: 2008-12-20 09:06:33 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Fixed version updating
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-20 03:50:46.641999960 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-20 03:55:02.255000114 -0500
committer: Daniel Lee Harple <lee...@gm...>
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 09:05:52 UTC (rev 8671)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 09:06:33 UTC (rev 8672)
@@ -56,7 +56,7 @@
end
task "remove-version" do
- rm_rf(build_path("src", "macosx"))
+ rm_rf(AAConfig.build_path("src", "macosx"))
end
desc "Update version"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-20 09:33:22
|
Revision: 8673
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8673&view=rev
Author: bazaarmagetron
Date: 2008-12-20 09:33:14 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Fixed dedicated building. We don't need copy/paste stuff there
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
armagetronad/trunk/armagetronad/src/ui/uMenu.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-20 03:55:02.255000114 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-20 04:28:21.411999941 -0500
committer: Daniel Lee Harple <lee...@gm...>
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 09:06:33 UTC (rev 8672)
+++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 09:33:14 UTC (rev 8673)
@@ -321,7 +321,6 @@
9BCBE30D0D922EAE0022855B /* AAPaste.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BCBE30B0D922EAE0022855B /* AAPaste.h */; };
9BCBE30E0D922EAE0022855B /* AAPaste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BCBE30C0D922EAE0022855B /* AAPaste.cpp */; };
9BCBE30F0D922EAE0022855B /* AAPaste.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BCBE30B0D922EAE0022855B /* AAPaste.h */; };
- 9BCBE3100D922EAE0022855B /* AAPaste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BCBE30C0D922EAE0022855B /* AAPaste.cpp */; };
9BD7D9720A2C7CB400D7033C /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD7D96B0A2C7CB400D7033C /* libfreetype.a */; };
9BD7D9730A2C7CB400D7033C /* libftgl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD7D96C0A2C7CB400D7033C /* libftgl.a */; };
9BD7D9740A2C7CB400D7033C /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD7D96D0A2C7CB400D7033C /* libpng.framework */; };
@@ -1686,7 +1685,6 @@
9BB7BA040D830473004FE8C3 /* uInputQueue.cpp in Sources */,
9BB7BA060D830473004FE8C3 /* uMenu.cpp in Sources */,
9BCBDE440D91F7F30022855B /* tColor.cpp in Sources */,
- 9BCBE3100D922EAE0022855B /* AAPaste.cpp in Sources */,
9B7CFE1F0EFCE74700126634 /* tResource.cpp in Sources */,
9B7CFE210EFCE74700126634 /* tResourceManager.cpp in Sources */,
9B7CFE230EFCE74700126634 /* tResourceType.cpp in Sources */,
Modified: armagetronad/trunk/armagetronad/src/ui/uMenu.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/ui/uMenu.cpp 2008-12-20 09:06:33 UTC (rev 8672)
+++ armagetronad/trunk/armagetronad/src/ui/uMenu.cpp 2008-12-20 09:33:14 UTC (rev 8673)
@@ -28,11 +28,13 @@
#include "aa_config.h"
-#ifdef MACOSX
-# include "AAPaste.h"
-# include <CoreFoundation/CoreFoundation.h>
-#else
-# include "scrap.h"
+#ifndef DEDICATED
+# ifdef MACOSX
+# include "AAPaste.h"
+# include <CoreFoundation/CoreFoundation.h>
+# else
+# include "scrap.h"
+# endif
#endif
#include "tSysTime.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-20 11:19:53
|
Revision: 8674
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8674&view=rev
Author: bazaarmagetron
Date: 2008-12-20 11:19:45 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Make AA module. Move AAConfig to AA::Config. Move xcode stuff out of AAConfig to AA:Xcode
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-20 04:28:21.411999941 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-20 04:43:39.260999918 -0500
committer: Daniel Lee Harple <lee...@gm...>
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 09:33:14 UTC (rev 8673)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 11:19:45 UTC (rev 8674)
@@ -5,7 +5,10 @@
Rake::Task[dir]
end
-module AAConfig
+module AA
+end
+
+module AA::Config
def self.combine_path_components(base, *components)
File.join(*([base] + components))
end
@@ -56,7 +59,7 @@
end
task "remove-version" do
- rm_rf(AAConfig.build_path("src", "macosx"))
+ rm_rf(AA::Config.build_path("src", "macosx"))
end
desc "Update version"
Modified: armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake 2008-12-20 09:33:14 UTC (rev 8673)
+++ armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake 2008-12-20 11:19:45 UTC (rev 8674)
@@ -1,7 +1,7 @@
-module AAConfig
+module AA::Xcode
def self.process_file(orig, package_dir=nil)
- result_file = build_path(orig.ext)
- orig = src_path(orig)
+ result_file = AA::Config.build_path(orig.ext)
+ orig = AA::Config.src_path(orig)
# Process the file (copy to build dir, replace tags)
file result_file => [orig, directory(result_file.pathmap("%d"))] do |t|
@@ -10,7 +10,7 @@
# replace the tags
open(result_file, "r+") do |f|
data = f.read
- TAG_MAPPINGS.each { |tag, value| data.gsub!("@#{tag}@", value) }
+ AA::Config::TAG_MAPPINGS.each { |tag, value| data.gsub!("@#{tag}@", value) }
f.rewind
f.print(data)
f.truncate(f.pos)
@@ -20,7 +20,7 @@
# Should the file be included with the game dist?
if package_dir
- package_dest = package_path(package_dir, result_file.pathmap("%f"))
+ package_dest = AA::Config.package_path(package_dir, result_file.pathmap("%f"))
file package_dest => [result_file, directory(package_dest.pathmap("%d"))] do |t|
cp(result_file, package_dest)
end
@@ -35,28 +35,28 @@
task "cleanup" => ["package-files", "package-resouces"]
task "sort-resources" do
- if !File.exists?(AAConfig.build_path("resource"))
- if AAConfig::BUILD_TYPE == :development
- sh %{"#{AAConfig::SRC_DIR}/batch/make/sortresources" \\
- "#{AAConfig::SRC_DIR}/resource/proto" \\
- "#{AAConfig::BUILD_DIR}/resource/included" \\
- "#{AAConfig::SRC_DIR}/batch/make/sortresources.py"}
+ if !File.exists?(AA::Config.build_path("resource"))
+ if AA::Config::BUILD_TYPE == :development
+ sh %{"#{AA::Config::SRC_DIR}/batch/make/sortresources" \\
+ "#{AA::Config::SRC_DIR}/resource/proto" \\
+ "#{AA::Config::BUILD_DIR}/resource/included" \\
+ "#{AA::Config::SRC_DIR}/batch/make/sortresources.py"}
else
- cp_r(AAConfig.src_path("resource"), AAConfig::BUILD_DIR)
+ cp_r(AA::Config.src_path("resource"), AA::Config::BUILD_DIR)
end
end
end
task "package-resouces" do
- if !File.exists?(AAConfig.package_path("resource"))
- cp_r(AAConfig.build_path("resource"), AAConfig::PACKGAGE_RESOURCE_DIR)
+ if !File.exists?(AA::Config.package_path("resource"))
+ cp_r(AA::Config.build_path("resource"), AA::Config::PACKGAGE_RESOURCE_DIR)
end
end
- AAConfig.process_file("src/macosx/version.h.in")
- AAConfig.process_file("config/aiplayers.cfg.in", "config")
- AAConfig.process_file("language/languages.txt.in", "language")
- if !AAConfig::DEDICATED
- AAConfig.process_file("src/macosx/English.lproj/InfoPlist.strings.in", "English.lproj")
+ AA::Xcode.process_file("src/macosx/version.h.in")
+ AA::Xcode.process_file("config/aiplayers.cfg.in", "config")
+ AA::Xcode.process_file("language/languages.txt.in", "language")
+ if !AA::Config::DEDICATED
+ AA::Xcode.process_file("src/macosx/English.lproj/InfoPlist.strings.in", "English.lproj")
end
end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-20 11:20:28
|
Revision: 8675
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8675&view=rev
Author: bazaarmagetron
Date: 2008-12-20 11:20:21 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Fixed wrapper suffix for testing rake tasks outside of xcode
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-20 04:43:39.260999918 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-20 05:08:58.237999916 -0500
committer: Daniel Lee Harple <lee...@gm...>
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 11:19:45 UTC (rev 8674)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 11:20:21 UTC (rev 8675)
@@ -44,7 +44,7 @@
PACKGAGE_RESOURCE_DIR = [
ENV["CONFIGURATION_BUILD_DIR"] || (BUILD_DIR + "/Debug"),
- DEDICATED ? "" : PRODUCT_NAME + (ENV["WRAPPER_SUFFIX"] || "") + "/Contents/Resources"
+ DEDICATED ? "" : PRODUCT_NAME + (ENV["WRAPPER_SUFFIX"] || ".app") + "/Contents/Resources"
].join("/")
BUILD_TYPE = [src_path(".svn"), src_path(".bzr")].any? { |f| File.exists?(f) } ? :development : :release
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-20 11:21:09
|
Revision: 8676
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8676&view=rev
Author: bazaarmagetron
Date: 2008-12-20 11:21:07 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Added targets to create a dmg for distribution.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
Added Paths:
-----------
armagetronad/trunk/armagetronad/MacOS/rakelib/release.rake
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-20 05:08:58.237999916 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-20 06:12:03.914999962 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
Modified: bzr:file-ids
-
+ MacOS/rakelib/release.rake release.rake-20081220111121-yd4i3f0h85igm9rd-1
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 11:20:21 UTC (rev 8675)
+++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 11:21:07 UTC (rev 8676)
@@ -6,6 +6,58 @@
objectVersion = 42;
objects = {
+/* Begin PBXAggregateTarget section */
+ 9B31399E0EFD0560009690D0 /* Create Client Release */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = 9B3139B90EFD05A3009690D0 /* Build configuration list for PBXAggregateTarget "Create Client Release" */;
+ buildPhases = (
+ 9B3139B40EFD0586009690D0 /* ShellScript */,
+ );
+ dependencies = (
+ 9B3139F20EFD0987009690D0 /* PBXTargetDependency */,
+ 9B3139B20EFD056D009690D0 /* PBXTargetDependency */,
+ );
+ name = "Create Client Release";
+ productName = "Create Client Release";
+ };
+ 9B3139BD0EFD073A009690D0 /* Create Dedicated Release */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = 9B3139C10EFD073A009690D0 /* Build configuration list for PBXAggregateTarget "Create Dedicated Release" */;
+ buildPhases = (
+ 9B3139C00EFD073A009690D0 /* ShellScript */,
+ );
+ dependencies = (
+ 9B3139F00EFD097D009690D0 /* PBXTargetDependency */,
+ 9B3139CF0EFD0756009690D0 /* PBXTargetDependency */,
+ );
+ name = "Create Dedicated Release";
+ productName = "Create Client Release";
+ };
+ 9B3139D00EFD0773009690D0 /* Create Full Release */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = 9B3139E60EFD079F009690D0 /* Build configuration list for PBXAggregateTarget "Create Full Release" */;
+ buildPhases = (
+ );
+ dependencies = (
+ 9B3139D40EFD077B009690D0 /* PBXTargetDependency */,
+ 9B3139D60EFD077B009690D0 /* PBXTargetDependency */,
+ );
+ name = "Create Full Release";
+ productName = "Create Full Release";
+ };
+ 9B3139EC0EFD0963009690D0 /* Update Version */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = 9B3139F40EFD0995009690D0 /* Build configuration list for PBXAggregateTarget "Update Version" */;
+ buildPhases = (
+ 9B3139EB0EFD0963009690D0 /* ShellScript */,
+ );
+ dependencies = (
+ );
+ name = "Update Version";
+ productName = "Update Version";
+ };
+/* End PBXAggregateTarget section */
+
/* Begin PBXBuildFile section */
8CBA60B1089F00F2007E21DC /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CBA60B0089F00F2007E21DC /* OpenGL.framework */; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
@@ -376,6 +428,51 @@
};
/* End PBXBuildRule section */
+/* Begin PBXContainerItemProxy section */
+ 9B3139B10EFD056D009690D0 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 8D1107260486CEB800E47090 /* Armagetron Advanced */;
+ remoteInfo = "Armagetron Advanced";
+ };
+ 9B3139CE0EFD0756009690D0 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 8C11CA41095A268E007AE0EA /* Armagetron Advanced Dedicated */;
+ remoteInfo = "Armagetron Advanced Dedicated";
+ };
+ 9B3139D30EFD077B009690D0 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 9B31399E0EFD0560009690D0 /* Create Client Release */;
+ remoteInfo = "Create Client Release";
+ };
+ 9B3139D50EFD077B009690D0 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 9B3139BD0EFD073A009690D0 /* Create Dedicated Release */;
+ remoteInfo = "Create Dedicated Release";
+ };
+ 9B3139EF0EFD097D009690D0 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 9B3139EC0EFD0963009690D0 /* Update Version */;
+ remoteInfo = "Update Version";
+ };
+ 9B3139F10EFD0987009690D0 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 9B3139EC0EFD0963009690D0 /* Update Version */;
+ remoteInfo = "Update Version";
+ };
+/* End PBXContainerItemProxy section */
+
/* Begin PBXCopyFilesBuildPhase section */
8CBA5DD5089EEBB3007E21DC /* Copy Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
@@ -1456,6 +1553,10 @@
targets = (
8D1107260486CEB800E47090 /* Armagetron Advanced */,
8C11CA41095A268E007AE0EA /* Armagetron Advanced Dedicated */,
+ 9B31399E0EFD0560009690D0 /* Create Client Release */,
+ 9B3139BD0EFD073A009690D0 /* Create Dedicated Release */,
+ 9B3139D00EFD0773009690D0 /* Create Full Release */,
+ 9B3139EC0EFD0963009690D0 /* Update Version */,
);
};
/* End PBXProject section */
@@ -1524,6 +1625,45 @@
shellPath = "/bin/bash -l";
shellScript = "rake xcode:cleanup\n\nfor f in *.in *.svn *.cvs *.cvsignore *.am astylerc\ndo\n\tfind \"${CONFIGURATION_BUILD_DIR}\" -name $f -depth -exec rm -rf \\{\\} \\;\ndone";
};
+ 9B3139B40EFD0586009690D0 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = "/bin/bash -l";
+ shellScript = "PRODUCT_NAME=\"Armagetron Advanced\" rake release:dmg\n";
+ };
+ 9B3139C00EFD073A009690D0 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = "/bin/bash -l";
+ shellScript = "PRODUCT_NAME=\"Armagetron Advanced Dedicated\" rake release:dmg\n";
+ };
+ 9B3139EB0EFD0963009690D0 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = "/bin/bash -l";
+ shellScript = "rake update-version";
+ };
9BD7DB490A2CBA7A00D7033C /* Run script: Prepare */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -1849,6 +1989,39 @@
};
/* End PBXSourcesBuildPhase section */
+/* Begin PBXTargetDependency section */
+ 9B3139B20EFD056D009690D0 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 8D1107260486CEB800E47090 /* Armagetron Advanced */;
+ targetProxy = 9B3139B10EFD056D009690D0 /* PBXContainerItemProxy */;
+ };
+ 9B3139CF0EFD0756009690D0 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 8C11CA41095A268E007AE0EA /* Armagetron Advanced Dedicated */;
+ targetProxy = 9B3139CE0EFD0756009690D0 /* PBXContainerItemProxy */;
+ };
+ 9B3139D40EFD077B009690D0 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 9B31399E0EFD0560009690D0 /* Create Client Release */;
+ targetProxy = 9B3139D30EFD077B009690D0 /* PBXContainerItemProxy */;
+ };
+ 9B3139D60EFD077B009690D0 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 9B3139BD0EFD073A009690D0 /* Create Dedicated Release */;
+ targetProxy = 9B3139D50EFD077B009690D0 /* PBXContainerItemProxy */;
+ };
+ 9B3139F00EFD097D009690D0 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 9B3139EC0EFD0963009690D0 /* Update Version */;
+ targetProxy = 9B3139EF0EFD097D009690D0 /* PBXContainerItemProxy */;
+ };
+ 9B3139F20EFD0987009690D0 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 9B3139EC0EFD0963009690D0 /* Update Version */;
+ targetProxy = 9B3139F10EFD0987009690D0 /* PBXContainerItemProxy */;
+ };
+/* End PBXTargetDependency section */
+
/* Begin PBXVariantGroup section */
9BB5B9260D84605700BF5F1C /* InfoPlist.strings.in */ = {
isa = PBXVariantGroup;
@@ -1993,6 +2166,90 @@
};
name = Release;
};
+ 9B31399F0EFD0560009690D0 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ PRODUCT_NAME = "Armagetron Advanced";
+ };
+ name = Debug;
+ };
+ 9B3139A00EFD0560009690D0 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ PRODUCT_NAME = "Create Client Release";
+ ZERO_LINK = NO;
+ };
+ name = Release;
+ };
+ 9B3139C20EFD073A009690D0 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ PRODUCT_NAME = "Armagetron Advanced Dedicated";
+ };
+ name = Debug;
+ };
+ 9B3139C30EFD073A009690D0 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ PRODUCT_NAME = "Create Client Release";
+ ZERO_LINK = NO;
+ };
+ name = Release;
+ };
+ 9B3139D10EFD0774009690D0 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ PRODUCT_NAME = "Create Full Release";
+ };
+ name = Debug;
+ };
+ 9B3139D20EFD0774009690D0 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ PRODUCT_NAME = "Create Full Release";
+ ZERO_LINK = NO;
+ };
+ name = Release;
+ };
+ 9B3139ED0EFD0963009690D0 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ PRODUCT_NAME = "Update Version";
+ };
+ name = Debug;
+ };
+ 9B3139EE0EFD0963009690D0 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ PRODUCT_NAME = "Update Version";
+ ZERO_LINK = NO;
+ };
+ name = Release;
+ };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -2023,6 +2280,42 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ 9B3139B90EFD05A3009690D0 /* Build configuration list for PBXAggregateTarget "Create Client Release" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 9B31399F0EFD0560009690D0 /* Debug */,
+ 9B3139A00EFD0560009690D0 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 9B3139C10EFD073A009690D0 /* Build configuration list for PBXAggregateTarget "Create Dedicated Release" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 9B3139C20EFD073A009690D0 /* Debug */,
+ 9B3139C30EFD073A009690D0 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 9B3139E60EFD079F009690D0 /* Build configuration list for PBXAggregateTarget "Create Full Release" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 9B3139D10EFD0774009690D0 /* Debug */,
+ 9B3139D20EFD0774009690D0 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 9B3139F40EFD0995009690D0 /* Build configuration list for PBXAggregateTarget "Update Version" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 9B3139ED0EFD0963009690D0 /* Debug */,
+ 9B3139EE0EFD0963009690D0 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
/* End XCConfigurationList section */
};
rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 11:20:21 UTC (rev 8675)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 11:21:07 UTC (rev 8676)
@@ -13,18 +13,36 @@
File.join(*([base] + components))
end
+ # A path to a file in src/
def self.src_path(*components)
combine_path_components(SRC_DIR, *components)
end
+ # A path to a file in MacOS/build/
def self.build_path(*components)
combine_path_components(BUILD_DIR, *components)
end
+ # A path to a file in MacOS/build/{Debug, etc}
+ def self.configuration_build_path(*components)
+ combine_path_components(CONFIGURATION_BUILD_DIR, *components)
+ end
+
+ # A path to a file in the resource directory of the game.
def self.package_path(*components)
combine_path_components(PACKGAGE_RESOURCE_DIR, *components)
end
+ # The arch of the build
+ def self.arch
+ archs = (ENV["ARCHS"] || "i386").split
+ if archs.length > 1
+ "universal"
+ else
+ archs.first
+ end
+ end
+
def self.version
if BUILD_TYPE == :development
%x("#{SRC_DIR}/batch/make/version" "#{SRC_DIR}").chomp
@@ -32,19 +50,33 @@
File.read("#{SRC_DIR}/src/macosx/version.h.in").scan(/#define VERSION "(.*)"/)[0][0]
end
end
+
+ # escape text to make it useable in a shell script as one “word” (string)
+ def self.escape_sh(str)
+ str.to_s.gsub(/(?=[^a-zA-Z0-9_.\/\-\x7F-\xFF\n])/, '\\').gsub(/\n/, "'\n'").sub(/^$/, "''")
+ end
# Paths are relative the Rakefile
SRC_DIR = File.expand_path(File.dirname(__FILE__) + "/..")
BUILD_DIR = ENV["SYMROOT"] || "build"
+ CONFIGURATION_BUILD_DIR = ENV["CONFIGURATION_BUILD_DIR"] || (BUILD_DIR + "/Debug")
+
PRODUCT_NAME = ENV["PRODUCT_NAME"] || "Armagetron Advanced"
DEDICATED = !!PRODUCT_NAME[/dedicated/i]
+ # The Armagetron Advanced.app, or the Armagetron Advanced Dedicated directory
+ PACKGAGE_RESOURCE_DIR_BASE = [
+ CONFIGURATION_BUILD_DIR,
+ DEDICATED ? "" : PRODUCT_NAME + (ENV["WRAPPER_SUFFIX"] || ".app")
+ ].join("/")
+
+ # Where all the game data should go
PACKGAGE_RESOURCE_DIR = [
- ENV["CONFIGURATION_BUILD_DIR"] || (BUILD_DIR + "/Debug"),
- DEDICATED ? "" : PRODUCT_NAME + (ENV["WRAPPER_SUFFIX"] || ".app") + "/Contents/Resources"
+ PACKGAGE_RESOURCE_DIR_BASE,
+ DEDICATED ? "" : "Contents/Resources"
].join("/")
BUILD_TYPE = [src_path(".svn"), src_path(".bzr")].any? { |f| File.exists?(f) } ? :development : :release
Added: armagetronad/trunk/armagetronad/MacOS/rakelib/release.rake
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakelib/release.rake (rev 0)
+++ armagetronad/trunk/armagetronad/MacOS/rakelib/release.rake 2008-12-20 11:21:07 UTC (rev 8676)
@@ -0,0 +1,54 @@
+module AA::Release
+ def self.create_dmg(directory, volume_name)
+ dmg = temp_file()
+ sh("hdiutil create -srcdir #{AA::Config.escape_sh directory} \\
+ -format UDIF #{AA::Config.escape_sh dmg} \\
+ -volname #{AA::Config.escape_sh volume_name}")
+
+ dmg + ".dmg"
+ end
+
+ def self.compress_dmg(uncompressed, new_compressed_name)
+ sh("hdiutil convert #{AA::Config.escape_sh uncompressed} \\
+ -format UDZO \\
+ -o #{AA::Config.escape_sh new_compressed_name}")
+ nil
+ end
+
+ def self.dmg_name
+ AA::Config.configuration_build_path("#{AA::Config::PROGRAM_SHORT_NAME}-#{AA::Config.version}.macosx-#{AA::Config.arch}")
+ end
+
+ def self.temp_file
+ %x{mktemp -t armagetronad}.chomp
+ end
+
+ def self.temp_directory
+ %x{mktemp -dt armagetronad}.chomp
+ end
+end
+
+namespace "release" do
+
+ task "dmg" do
+ release_directory = AA::Release.temp_directory
+ final_dmg = AA::Release.dmg_name
+
+ final_dmg_plus_ext = final_dmg + ".dmg"
+ if File.exists?(final_dmg_plus_ext)
+ rm(final_dmg_plus_ext)
+ end
+
+ # Gather files to package
+ cp_r(AA::Config::PACKGAGE_RESOURCE_DIR_BASE, release_directory)
+
+ # Make the dmg
+ uncompressed_dmg = AA::Release.create_dmg(release_directory, AA::Config::PRODUCT_NAME)
+ AA::Release.compress_dmg(uncompressed_dmg, final_dmg)
+
+ # Cleanup
+ rm(uncompressed_dmg)
+ rm_rf(release_directory)
+ end
+
+end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-20 11:55:58
|
Revision: 8678
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8678&view=rev
Author: bazaarmagetron
Date: 2008-12-20 11:52:45 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: The dedicated dmg was including the wrong directory
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-20 06:27:57.464999914 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-20 06:46:53.510999918 -0500
committer: Daniel Lee Harple <lee...@gm...>
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 11:51:53 UTC (rev 8677)
+++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 11:52:45 UTC (rev 8678)
@@ -1649,7 +1649,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/bin/bash -l";
- shellScript = "PRODUCT_NAME=\"Armagetron Advanced Dedicated\" rake release:dmg\n";
+ shellScript = "PRODUCT_NAME=\"Armagetron Advanced Dedicated\"\nCONFIGURATION_BUILD_DIR=\"${CONFIGURATION_BUILD_DIR}/Armagetron Advanced Dedicated\"\n\nrake release:dmg\n";
};
9B3139EB0EFD0963009690D0 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 11:51:53 UTC (rev 8677)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 11:52:45 UTC (rev 8678)
@@ -70,14 +70,14 @@
# The Armagetron Advanced.app, or the Armagetron Advanced Dedicated directory
PACKGAGE_RESOURCE_DIR_BASE = [
CONFIGURATION_BUILD_DIR,
- DEDICATED ? "" : PRODUCT_NAME + (ENV["WRAPPER_SUFFIX"] || ".app")
- ].join("/")
+ DEDICATED ? nil : PRODUCT_NAME + (ENV["WRAPPER_SUFFIX"] || ".app")
+ ].compact.join("/")
# Where all the game data should go
PACKGAGE_RESOURCE_DIR = [
PACKGAGE_RESOURCE_DIR_BASE,
- DEDICATED ? "" : "Contents/Resources"
- ].join("/")
+ DEDICATED ? nil : "Contents/Resources"
+ ].compact.join("/")
BUILD_TYPE = [src_path(".svn"), src_path(".bzr")].any? { |f| File.exists?(f) } ? :development : :release
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-20 11:55:57
|
Revision: 8677
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8677&view=rev
Author: bazaarmagetron
Date: 2008-12-20 11:51:53 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Oops, mixed up program short name
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-20 06:12:03.914999962 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-20 06:27:57.464999914 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
Modified: bzr:file-ids
- MacOS/rakelib/release.rake release.rake-20081220111121-yd4i3f0h85igm9rd-1
+
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 11:21:07 UTC (rev 8676)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-20 11:51:53 UTC (rev 8677)
@@ -87,7 +87,7 @@
"progtitle" => PRODUCT_NAME,
}
- PROGRAM_SHORT_NAME = DEDICATED ? "armagetronad" : "armagetronad-dedicated"
+ PROGRAM_SHORT_NAME = DEDICATED ? "armagetronad-dedicated" : "armagetronad"
end
task "remove-version" do
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-21 18:23:22
|
Revision: 8679
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8679&view=rev
Author: bazaarmagetron
Date: 2008-12-21 18:23:13 +0000 (Sun, 21 Dec 2008)
Log Message:
-----------
author: Daniel Lee Harple
?\226?\128?\162 New BISON variable to determine which bison to use.
?\226?\128?\162 Updated README-Subversion with info on what 10.4 users have to install.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
armagetronad/trunk/armagetronad/README-Subversion
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-20 06:46:53.510999918 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-21 13:16:37.010999918 -0500
committer: Daniel Lee Harple <lee...@gm...>
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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 11:52:45 UTC (rev 8678)
+++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-21 18:23:13 UTC (rev 8679)
@@ -401,7 +401,7 @@
outputFiles = (
"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).tab.cpp",
);
- script = "bison -o \"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.tab.cpp\" \"${INPUT_FILE_PATH}\"";
+ script = "test -n \"${BISON}\" || BISON=bison\n$BISON -o \"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.tab.cpp\" \"${INPUT_FILE_PATH}\"";
};
9BB5B8560D845C2500BF5F1C /* PBXBuildRule */ = {
isa = PBXBuildRule;
@@ -412,7 +412,7 @@
outputFiles = (
"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).tab.cpp",
);
- script = "bison -o \"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.tab.cpp\" \"${INPUT_FILE_PATH}\"";
+ script = "test -n \"${BISON}\" || BISON=bison\n$BISON -o \"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.tab.cpp\" \"${INPUT_FILE_PATH}\"";
};
9BC0F61A0B517A8B0041120B /* PBXBuildRule */ = {
isa = PBXBuildRule;
@@ -433,42 +433,42 @@
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 8D1107260486CEB800E47090 /* Armagetron Advanced */;
+ remoteGlobalIDString = 8D1107260486CEB800E47090;
remoteInfo = "Armagetron Advanced";
};
9B3139CE0EFD0756009690D0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 8C11CA41095A268E007AE0EA /* Armagetron Advanced Dedicated */;
+ remoteGlobalIDString = 8C11CA41095A268E007AE0EA;
remoteInfo = "Armagetron Advanced Dedicated";
};
9B3139D30EFD077B009690D0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 9B31399E0EFD0560009690D0 /* Create Client Release */;
+ remoteGlobalIDString = 9B31399E0EFD0560009690D0;
remoteInfo = "Create Client Release";
};
9B3139D50EFD077B009690D0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 9B3139BD0EFD073A009690D0 /* Create Dedicated Release */;
+ remoteGlobalIDString = 9B3139BD0EFD073A009690D0;
remoteInfo = "Create Dedicated Release";
};
9B3139EF0EFD097D009690D0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 9B3139EC0EFD0963009690D0 /* Update Version */;
+ remoteGlobalIDString = 9B3139EC0EFD0963009690D0;
remoteInfo = "Update Version";
};
9B3139F10EFD0987009690D0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 9B3139EC0EFD0963009690D0 /* Update Version */;
+ remoteGlobalIDString = 9B3139EC0EFD0963009690D0;
remoteInfo = "Update Version";
};
/* End PBXContainerItemProxy section */
Modified: armagetronad/trunk/armagetronad/README-Subversion
===================================================================
--- armagetronad/trunk/armagetronad/README-Subversion 2008-12-20 11:52:45 UTC (rev 8678)
+++ armagetronad/trunk/armagetronad/README-Subversion 2008-12-21 18:23:13 UTC (rev 8679)
@@ -65,7 +65,7 @@
If all goes smoothly, you can now edit Armagetron Advanced and run it.
Mac OS X
-=======
+========
The Mac OS project is located in the armagetronad/MacOS/ directory.
@@ -78,7 +78,20 @@
https://sf.net/project/showfiles.php?group_id=110997&package_id=266788
+Aditional Required Software
+---------------------------
+If you are running Mac OS X 10.5 then nothing else is required.
+
+If you are running 10.4 then you must install:
+
+* rake: macports name rb-rake. http://rake.rubyforge.org
+* bison: macports name bison. http://www.gnu.org/software/bison
+
+You must also add a user-defined setting in Xcode, BISON. Its value should
+be the path of the newly installed bison.
+
+
Windows + VisualC
=================
You'll need to check out the additional module build_visualc parallel to this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X