Merge lp:~luke-jr/armagetronad/armagetronad-zonesv2-cleanup into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work

[Luke-Jr]

[Manuel Moos (z-man)]

review: Approve

=== modified file 'src/engine/eGameObject.cpp'
--- src/engine/eGameObject.cpp	2008-04-25 18:00:53 +0000
+++ src/engine/eGameObject.cpp	2009-02-27 08:05:29 +0000
@@ -638,6 +638,14 @@
 
 void eGameObject::OnRoundBegin(){}
 void eGameObject::OnRoundEnd(){}
+void eGameObject::OnBirth(){}
+
+void eGameObject::EnsureBorn() {
+    if (_born)
+        return;
+    _born = true;
+    OnBirth();
+}
 
 void eGameObject::Kill(){}
 
@@ -703,6 +711,8 @@
 
     tJUST_CONTROLLED_PTR< eGameObject > keep( c ); // keep object alive
 
+    c->EnsureBorn();
+
     REAL maxstep=.2;
 
     // don't do a thing if the timestep is too small

=== modified file 'src/engine/eGameObject.h'
--- src/engine/eGameObject.h	2008-03-08 16:55:06 +0000
+++ src/engine/eGameObject.h	2009-02-27 08:05:29 +0000
@@ -57,6 +57,9 @@
     // small wrapper of TimestepThis doing preparation and cleanup work
     static void TimestepThisWrapper(eGrid * grid, REAL currentTime, eGameObject *t, REAL minTimestep);
 
+    //! called immediately after the object is created, either right after round beginning or mid-game creation
+    virtual void OnBirth();
+
 protected:
     // does a timestep and all interactions for this gameobject,
     // divided in many small steps
@@ -89,6 +92,8 @@
     tJUST_CONTROLLED_PTR<eFace> currentFace;  // the eFace pos it is currently
     tCHECKED_PTR(eGrid) grid;         // the game grid we are on
 
+    bool _born;
+
     // entry and deletion in the list of all eGameObjects
 public:
     //! tells game objects what the maximum lag caused by lazy simulation of timesteps is
@@ -164,6 +169,9 @@
     //! called when the round ends
     virtual void OnRoundEnd();
 
+    //! call to ensure the object is "born"
+    void EnsureBorn();
+
     //! destroys the gameobject (in the game)
     virtual void Kill();
 

=== modified file 'src/tools/tPolynomial.cpp'
--- src/tools/tPolynomial.cpp	2009-02-22 23:34:35 +0000
+++ src/tools/tPolynomial.cpp	2009-02-27 09:07:52 +0000
@@ -74,6 +74,14 @@
     // Empty
 }
 
+tPolynomial::tPolynomial(const tFunction &tf, REAL refValue)  //!< constructor
+        : referenceVarValue(refValue),
+        coefs(2)
+{
+    coefs[0] = tf.offset_;
+    coefs[1] = tf.slope_;
+}
+
 tPolynomial::tPolynomial(const tFunction &tf)  //!< constructor
         : referenceVarValue(0.0),
         coefs(2)

=== modified file 'src/tools/tPolynomial.h'
--- src/tools/tPolynomial.h	2009-02-22 23:34:35 +0000
+++ src/tools/tPolynomial.h	2009-02-27 09:07:52 +0000
@@ -54,6 +54,7 @@
     tPolynomial(REAL value);  //!< constructor for constant polynomial
     tPolynomial(tArray<REAL> const & newCoefs);  //!< constructor
     tPolynomial(const tPolynomial &tf);  //!< constructor
+    tPolynomial(const tFunction &tf, REAL refValue);  //!< constructor
     tPolynomial(const tFunction &tf);  //!< constructor
     tPolynomial(std::string str);  //!< constructor
 

=== modified file 'src/tron/gGame.cpp'
--- src/tron/gGame.cpp	2009-02-26 19:57:28 +0000
+++ src/tron/gGame.cpp	2009-02-27 08:05:29 +0000
@@ -2728,6 +2728,7 @@
                     if ( e )
                     {
                         e->OnRoundBegin();
+                        e->EnsureBorn();
                     }
                 }
             }

=== modified file 'src/tron/gParser.cpp'
--- src/tron/gParser.cpp	2009-02-26 22:15:59 +0000
+++ src/tron/gParser.cpp	2009-02-27 18:21:24 +0000
@@ -933,7 +933,9 @@
     // Get the label of the effector to be used
     string effectorAttribute( myxmlGetProp(cur, "effect"));
 
-    effector = zEffectorPtr(zEffectorManager::Create(effectorAttribute, tXmlParser::node(cur)));
+    effector = zEffectorPtr(zEffectorManager::Create(effectorAttribute));
+    effector->applyContext(state);
+    effector->readXML(tXmlParser::node(cur));
 
     return effector;
 }
@@ -2013,20 +2015,35 @@
 
 bool
 gParser::State_t::exists(std::string const & var)
+const
 {
     return _varstack.front().find(var) != _varstack.front().end();
 }
 
 bool
 gParser::State_t::isset(std::string const & var)
+const
 {
-    return exists(var) && !_varstack.front()[var]->empty();
+    if (!exists(var))
+        return false;
+    my_map_t vars = _varstack.front();
+    my_map_t::const_iterator i;
+    if ((i = vars.find(var)) == vars.end())
+        return false;
+    if (i->second->empty())
+        return false;
+    return true;
 }
 
 boost::any
 gParser::State_t::getAny(std::string const & var)
+const
 {
-    return *(_varstack.front()[var]);
+    my_map_t vars = _varstack.front();
+    my_map_t::const_iterator i;
+    if ((i = vars.find(var)) == vars.end())
+        return boost::any();
+    return *(i->second);
 }
 
 void

=== modified file 'src/tron/gParser.h'
--- src/tron/gParser.h	2009-02-26 21:28:08 +0000
+++ src/tron/gParser.h	2009-02-27 18:21:24 +0000
@@ -32,13 +32,13 @@
 public:
     gParserState();
 
-    bool exists(std::string const & var);
-    bool isset(std::string const & var);
-    template<typename T> bool istype(std::string const & var) {
+    bool exists(std::string const & var) const;
+    bool isset(std::string const & var) const;
+    template<typename T> bool istype(std::string const & var) const {
         if (!isset(var))
             return false;
         try {
-            boost::any_cast<T>(*(_varstack.front()[var]));
+            boost::any_cast<T>(getAny(var));
             return true;
         }
         catch (const boost::bad_any_cast &)
@@ -46,8 +46,8 @@
             return false;
         }
     }
-    boost::any getAny(std::string const & var);
-    template<typename T> T get(std::string const & var) {
+    boost::any getAny(std::string const & var) const;
+    template<typename T> T get(std::string const & var) const {
         return boost::any_cast<T>(getAny(var));
     }
     void setAny(std::string const & var, boost::any val);

=== removed file 'src/tron/zone/shapeCircle.h'
--- src/tron/zone/shapeCircle.h	2006-08-02 20:19:33 +0000
+++ src/tron/zone/shapeCircle.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-typedef boost::shared_ptr<shape> ShapePtr;
-
-class shape {
-    virtual ~shape();
-};
-
-class shapeCircle : public shape {
-    tValue::Base() x;
-    tValue::Base() y;
-    tValue::Base() radius;
-
-public :
-    shapeCircle(tValue::Base() _x, tValue::Base() _y, tValue::Base() _radius): x(_x), y(_y), radius(_radius) { };
-
-};
-
-class shapeTriangle : public shape {
-    tValue::Base() x1;
-    tValue::Base() y1;
-    tValue::Base() x2;
-    tValue::Base() y2;
-    tValue::Base() x3;
-    tValue::Base() y3;
-
-public:
-    shapeSquare(tValue::Base() _x1, tValue::Base() _y1,
-                tValue::Base() _x2, tValue::Base() _y2,
-                tValue::Base() _x3, tValue::Base() _y3,
-               ):
-            x1(_x1), y1(_y1),
-            x2(_x2), y2(_y2),
-            x3(_x3), y3(_y3)
-    {};
-};

=== modified file 'src/tron/zone/zEffectGroup.cpp'
--- src/tron/zone/zEffectGroup.cpp	2009-02-03 08:50:43 +0000
+++ src/tron/zone/zEffectGroup.cpp	2009-02-27 16:25:51 +0000
@@ -29,8 +29,6 @@
 
 zEffectGroup::zEffectGroup(gVectorExtra< nNetObjectID > const owners, gVectorExtra< nNetObjectID > const teamOwners):
         validators(),
-        //	monitorInfluences(),
-        //	zoneInfluences(),
         d_owners(owners),
         d_teamOwners(teamOwners),
         d_calculatedTargets()
@@ -38,8 +36,6 @@
 
 zEffectGroup::zEffectGroup(zEffectGroup const &other) :
         validators(other.validators),
-        //	monitorInfluences(other.monitorInfluences),
-        //	zoneInfluences(other.zoneInfluences),
         d_owners(other.d_owners),
         d_teamOwners(other.d_teamOwners),
         d_calculatedTargets(other.d_calculatedTargets)

=== modified file 'src/tron/zone/zEffector.cpp'
--- src/tron/zone/zEffector.cpp	2009-02-26 19:57:28 +0000
+++ src/tron/zone/zEffector.cpp	2009-02-27 18:21:24 +0000
@@ -86,6 +86,9 @@
     */
 }
 
+void zEffector::applyContext(gParserState const &) {
+}
+
 void
 zEffector::readXML(tXmlParser::node const & node)
 {
@@ -291,17 +294,9 @@
 
 static zEffectorRegistration regSpawnPlayer("spawnplayer", "", zEffectorSpawnPlayer::create);
 
-void
-zEffectorSpawnPlayer::readXML(tXmlParser::node const & node)
-{
-    // FIXME: Unique issue, we just care about context, not the node itself
-    // FIXME: Someday, this will need to be checked for the right arena/grid
-
-    gParser*parser = dynamic_cast<gParser*>(node.ownerDocument());
-    assert(parser);
-
-    setGrid(parser->contextGrid(node));
-    setArena(parser->contextArena(node));
+void zEffectorSpawnPlayer::applyContext(gParserState const & state) {
+    setGrid( state.get<eGrid*>("grid") );
+    setArena( state.get<gArena*>("arena") );
 }
 
 void zEffectorSpawnPlayer::effect(gVectorExtra<ePlayerNetID *> &d_calculatedTargets)

=== modified file 'src/tron/zone/zEffector.h'
--- src/tron/zone/zEffector.h	2009-02-26 19:57:28 +0000
+++ src/tron/zone/zEffector.h	2009-02-27 18:21:24 +0000
@@ -41,6 +41,8 @@
 #include "tFunction.h"
 #include "tXmlParser.h"
 
+class gParserState;
+
 class zEffector
 {
 public:
@@ -54,6 +56,7 @@
     void apply(gVectorExtra<ePlayerNetID *> &d_calculatedTargets);
     virtual void effect(gVectorExtra<ePlayerNetID *> &d_calculatedTargets) { };
 
+    virtual void applyContext(gParserState const &);
     virtual void readXML(tXmlParser::node const &);
 
     void setCount(int _count) {count = _count;};
@@ -245,7 +248,7 @@
     virtual zEffectorSpawnPlayer *copy(void) const { return new zEffectorSpawnPlayer(*this); };
     virtual ~zEffectorSpawnPlayer() {};
 
-    void readXML(tXmlParser::node const &);
+    void applyContext(gParserState const &);
 
     void setGrid(eGrid *_grid) {grid = _grid;};
     void setArena(gArena *_arena) {arena = _arena;};

=== modified file 'src/tron/zone/zFortress.cpp'
--- src/tron/zone/zFortress.cpp	2009-02-27 03:35:38 +0000
+++ src/tron/zone/zFortress.cpp	2009-02-27 08:58:49 +0000
@@ -341,7 +341,10 @@
     {
         int kills = int( sg_onConquestKillRatio * team->NumPlayers() );
         kills = kills > sg_onConquestKillMin ? kills : sg_onConquestKillMin;
-        eCoord pos = GetPosition();
+        tCoord pos;
+        if (shape)
+            pos = shape->Position();
+        // FIXME: What should we use for origin if there is no shape?
 
         while ( kills > 0 )
         {
@@ -395,7 +398,14 @@
 {
     if ( team )
     {
-        sg_basezoneConqueredWriter << ePlayerNetID::FilterName(team->Name()) << GetPosition().x << GetPosition().y;
+        if (shape)
+        {
+            tCoord p = shape->Position();
+
+            sg_basezoneConqueredWriter << ePlayerNetID::FilterName(team->Name()) << p.x << p.y;
+        }
+        else
+            sg_basezoneConqueredWriter << ePlayerNetID::FilterName(team->Name());
         sg_basezoneConqueredWriter.write();
     }
     if (shape)
@@ -553,7 +563,10 @@
         const tList<eGameObject>& gameObjects = Grid()->GameObjects();
         gCycle * closest = NULL;
         REAL closestDistance = 0;
-        eCoord pos = GetPosition();
+        tCoord pos;
+        if (shape)
+            pos = shape->Position();
+        // FIXME: What should we use for origin if there is no shape?
         for (int i=gameObjects.Len()-1;i>=0;i--)
         {
             gCycle *other=dynamic_cast<gCycle *>(gameObjects(i));

=== modified file 'src/tron/zone/zMisc.h'
--- src/tron/zone/zMisc.h	2007-06-08 21:17:35 +0000
+++ src/tron/zone/zMisc.h	2009-02-27 18:30:44 +0000
@@ -33,13 +33,4 @@
     return false;
 }
 
-/*
- * HACK 
- * This is a very bad solution that hopefully will find a better design
- *
- * Basis for the "other" data that might be passed to an effect group 
- * ATM: only the value from the monitor is passed 
- * We use an auto_ptr so we can control if there is a value or not 
-*/
-typedef boost::shared_ptr<REAL> miscDataPtr;
 #endif

=== modified file 'src/tron/zone/zSelector.cpp'
--- src/tron/zone/zSelector.cpp	2008-01-04 21:38:34 +0000
+++ src/tron/zone/zSelector.cpp	2009-02-27 18:36:17 +0000
@@ -839,29 +839,6 @@
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 //
 // Count the number of other alive players in the same team as thePlayer, ie: excluding thePlayer
 //

=== modified file 'src/tron/zone/zShape.cpp'
--- src/tron/zone/zShape.cpp	2009-02-27 06:14:39 +0000
+++ src/tron/zone/zShape.cpp	2009-02-27 09:12:12 +0000
@@ -1,3 +1,4 @@
+#include "eSoundMixer.h"
 #include "rScreen.h"
 #include "zShape.hpp"
 #include "gCycle.h"
@@ -143,6 +144,13 @@
         setScale( state.get<tFunction>("scale") );
 }
 
+void
+zShape::OnBirth() {
+    eSoundMixer* mixer = eSoundMixer::GetMixer();
+    mixer->PushButton(ZONE_SPAWN, Position());
+}
+
+
 REAL zShape::calcDistanceNear(tCoord & p) {
     return (findPointNear(p) - p).Norm();
 }
@@ -216,6 +224,10 @@
     );
 }
 
+REAL zShape::GetCurrentScale() const {
+    return scale_.Evaluate(lasttime_ - referencetime_);
+}
+
 REAL zShape::GetEffectiveBottom() const {
     if (bottom_.Len())
         return bottom_.evaluate(lastTime);
@@ -228,6 +240,12 @@
     return sz_zoneHeight;
 }
 
+tCoord zShape::GetRotation() const {
+    REAL currAngle = rotation2.evaluate(lasttime_);
+    tCoord rot( cos(currAngle), sin(currAngle) );
+    return rot;
+}
+
 REAL zShape::GetRotationSpeed() {
     return getRotation2().evaluateRate(1, lasttime_);
 }
@@ -357,8 +375,7 @@
     if ( color_.a_ <= 0 )
         return;
 
-    REAL currAngle = rotation2.evaluate(lasttime_);
-    eCoord rot( cos(currAngle), sin(currAngle) );
+    tCoord rot = GetRotation();
 
     GLfloat m[4][4]={{rot.x,rot.y,0,0},
                      {-rot.y,rot.x,0,0},
@@ -444,8 +461,7 @@
     if ( color_.a_ <= 0 )
         return;
 
-    REAL currAngle = rotation2.evaluate(lasttime_);
-    eCoord rot( cos(currAngle), sin(currAngle) );
+    tCoord rot = GetRotation();
 
     GLfloat m[4][4]={{rot.x,rot.y,0,0},
                      {-rot.y,rot.x,0,0},
@@ -586,8 +602,7 @@
     REAL x_ = (*iter).first.Evaluate(lasttime_ - referencetime_);
     REAL y_ = (*iter).second.Evaluate(lasttime_ - referencetime_);
     tCoord centerPos = tCoord(posx_.Evaluate(lasttime_ - referencetime_), posy_.Evaluate(lasttime_ - referencetime_));
-    //    tCoord rotation = tCoord( cosf(rotation_.Evaluate(lasttime_ - referencetime_)), sinf(rotation_.Evaluate(lasttime_ - referencetime_)) );
-    tCoord rotation = tCoord( cosf(rotation2.evaluate(lasttime_)), sinf(rotation2.evaluate(lasttime_)) );
+    tCoord rotation = GetRotation();
     currentScale = scale_.Evaluate(lasttime_ - referencetime_);
     tCoord previous = tCoord(x_, y_).Turn( rotation )*currentScale + centerPos;
 

=== modified file 'src/tron/zone/zShape.hpp'
--- src/tron/zone/zShape.hpp	2009-02-27 06:14:39 +0000
+++ src/tron/zone/zShape.hpp	2009-02-27 09:12:12 +0000
@@ -67,6 +67,7 @@
   tFunction getPosX() {return posx_;};
   tFunction getPosY() {return posy_;};
     tPolynomial getRotation2() { return rotation2; };
+    REAL GetCurrentScale() const;
   tFunction getScale() {return scale_;};
   rColor getColor() {return color_;};
 
@@ -74,6 +75,7 @@
     REAL GetEffectiveHeight() const;
 
     //! shortcut rotation functions
+    tCoord GetRotation() const;
     REAL GetRotationSpeed();
     void SetRotationSpeed(REAL r);
     REAL GetRotationAcceleration();
@@ -87,6 +89,10 @@
     virtual void setGrowth(REAL growth);  //!< similar to old zones v1 setExpansionSpeed, but generic
     virtual void collapse(REAL speed);  //!< set growth such that collapse happens in a timeframe
 
+private:
+    //! called immediately after the object is created, either right after round beginning or mid-game creation
+    virtual void OnBirth();
+
 public:  // DEPRECATED -- DO NOT USE
     void __deprecated render(const eCamera*cam) { Render(cam); }
     void __deprecated render2d(tCoord&scale) { Render2D(scale); }
@@ -103,8 +109,6 @@
     tPolynomial seglength_; //!< Length of each segment making up the zone
     rColor color_;
 
-    eCoord Position() { return eCoord(posx_(lastTime - referencetime_), posy_(lastTime - referencetime_) ); };
-
     void setCreatedTime(REAL time);
 
     REAL createdtime_; // The in-game time when this shape was first instantiated

=== modified file 'src/tron/zone/zTimedZone.cpp'
--- src/tron/zone/zTimedZone.cpp	2009-02-26 22:20:40 +0000
+++ src/tron/zone/zTimedZone.cpp	2009-02-27 18:38:14 +0000
@@ -70,14 +70,5 @@
 
     zone->setShape( shape );
 
-    /* TODO FIXME
-    // initialize radius and expansion speed
-    static_cast<eGameObject*>(ret)->Timestep( se_GameTime() );
-    ret->SetReferenceTime();
-    ret->SetRadius( sg_initialSize );
-    ret->SetExpansionSpeed( sg_expansionSpeed );
-    ret->SetRotationSpeed( .3f );
-    */
-
     return zone;
 }

=== modified file 'src/tron/zone/zZone.cpp'
--- src/tron/zone/zZone.cpp	2009-02-27 03:53:07 +0000
+++ src/tron/zone/zZone.cpp	2009-02-27 09:12:12 +0000
@@ -39,7 +39,6 @@
 #include "nConfig.h"
 #include "tString.h"
 #include "rScreen.h"
-#include "eSoundMixer.h"
 #include "tPolynomial.h"
 
 
@@ -61,9 +60,6 @@
 
 std::deque<zZone *> sz_Zones;
 
-// number of segments to render a zone with
-static const int sg_segments = 11;
-
 // *******************************************************************************
 // *
 // *   EvaluateFunctionNow
@@ -115,7 +111,6 @@
         effectGroupOutside(),
         playersInside(),
         playersOutside(),
-        oldFortressAutomaticAssignmentBehavior_(false),
         name_()
 {
     // store creation time
@@ -125,11 +120,6 @@
     this->AddToList();
 
     sz_Zones.push_back(this);
-
-    // initialize position functions
-    //    SetPosition( pos );
-    eSoundMixer* mixer = eSoundMixer::GetMixer();
-    mixer->PushButton(ZONE_SPAWN, pos);
 }
 
 static nVersionFeature sz_ShapedZones(20);
@@ -149,25 +139,16 @@
         //rotation_(1,0),
         playersInside(),
         playersOutside(),
-        oldFortressAutomaticAssignmentBehavior_(false),
         name_()
 {
     // read creation time
     createTime_ = sync.create_time();
     referenceTime_ = lastTime = createTime_;
 
-    // initialize color to white, ReadSync will fill in the true value if available
-    //    color_.r_ = color_.g_ = color_.b_ = 1.0f;
-
     // add to game grid
     this->AddToList();
 
     sz_Zones.push_back(this);
-
-    // initialize position functions
-    //    SetPosition( pos );
-    eSoundMixer* mixer = eSoundMixer::GetMixer();
-    mixer->PushButton(ZONE_SPAWN, pos);
 }
 
 // *******************************************************************************
@@ -319,31 +300,6 @@
 
 bool zZone::Timestep( REAL time )
 {
-    /*
-       if(!emulateOldZoneShape) {
-           shape->TimeStep( time );
-       }
-       else { // Old representation of zone
-       // rotate
-       REAL speed = GetRotationSpeed();
-       REAL angle = ( time - lastTime ) * speed;
-       // angle /= ( 1 + 2 * 3.14159 * angle/sg_segments );
-       rotation_ = rotation_.Turn( cos( angle ), sin( angle ) );
-
-       // move to new position
-       REAL dt = time - referenceTime_;
-       Move( eCoord( posx_( dt ), posy_( dt ) ), lastTime, time );
-       
-
-       // kill this zone if it shrunk down to zero scale
-       if ( GetExpansionSpeed() < 0 && GetScale() <= 0 )
-       {
-           OnVanish();
-           return true;
-       }
-       }
-       // update time
-       */
     lastTime = time;
 
     return false;
@@ -519,24 +475,6 @@
     return zone_init;
 }
 
-/*
-// *******************************************************************************
-// *
-// *	Scale
-// *
-// *******************************************************************************
-//!
-//!		@return
-//!
-// *******************************************************************************
-
-REAL zZone::Scale( void ) const
-{
-    //    return GetScale();
-    return shape->getScale();
-}
-*/
-
 
 // *******************************************************************************
 // *
@@ -571,8 +509,7 @@
 zZone const & zZone::GetPosition( eCoord & position ) const
 {
     if(0 != shape) {
-        position.x = EvaluateFunctionNow( shape->getPosX() );
-	position.y = EvaluateFunctionNow( shape->getPosY() );
+        position = shape->Position();
     }
     return *this;
 }
@@ -589,15 +526,11 @@
 
 REAL zZone::GetScale( void ) const
 {
-    //    REAL ret = EvaluateFunctionNow( this->scale_ );
-    //    ret = ret > 0 ? ret : 0;
-
-
     // HACK, to be implemented later and differently
     // Should get this info from the shape, not the zone
     REAL scale = 0.0;
     if(0 != shape) {
-        scale = EvaluateFunctionNow( shape->getScale() ) ;
+        scale = shape->GetCurrentScale();
     }
     return scale;
 }
@@ -613,14 +546,6 @@
 
 void zZone::SetReferenceTime( void )
 {
-    // set offsets to current values
-    /*
-      this->posx_.SetOffset( EvaluateFunctionNow( this->posx_ ) );
-      this->posy_.SetOffset( EvaluateFunctionNow( this->posy_ ) );
-      this->scale_.SetOffset( EvaluateFunctionNow( this->scale_ ) );
-      this->rotationSpeed_.SetOffset( EvaluateFunctionNow( this->rotationSpeed_ ) );
-    */
-
     // FIXME: zZone didn't originally do this, but it is added for compat w/
     //         Zones v1 porting; nothing in zones v2 seems to actually use this
     //         function
@@ -645,7 +570,9 @@
 {
     // HACK, to be implemented later and differently
     // Should get this info from the shape, not the zone
+    if (!shape)
     return tCoord(0.0, 0.0);
+    return shape->GetRotation();
 }
 
 // *******************************************************************************

=== modified file 'src/tron/zone/zZone.h'
--- src/tron/zone/zZone.h	2009-02-26 19:57:28 +0000
+++ src/tron/zone/zZone.h	2009-02-27 09:02:54 +0000
@@ -44,34 +44,9 @@
 
 class gParserState;
 
-/*
-class zZone: public eNetGameObject
-{
-    zZone(eGrid *grid); //!< local constructor
-    zZone(nMessage &m);                    //!< network constructor
-    ~zZone();                              //!< destructor
-
-    void SetReferenceTime();               //!< sets the reference time to the current time
-
- protected:
-    virtual bool Timestep(REAL currentTime);     //!< simulates behaviour up to currentTime
-    virtual void OnVanish();                     //!< called when the zone vanishes
-private:
-    virtual void WriteCreate(nMessage &m); //!< writes data for network constructor
-    virtual void WriteSync(nMessage &m);   //!< writes sync data
-    virtual void ReadSync(nMessage &m);    //!< reads sync data
-
-    virtual void InteractWith( eGameObject *target,REAL time,int recursion=1 ); //!< looks for objects inzide the zone and reacts on them
-    virtual nDescriptor& CreatorDescriptor() const; //!< returns the descriptor to recreate this object over the network
-
-    virtual void Render(const eCamera *cam);  //!< renders the zone
-}
-*/
-
-class zZone: public eNetGameObject
-{
-private:
-    // TODO FIXME \
+class zZone: public eNetGameObject
+{
+private:
     void*pos;  //!< pos is not valid for zones
 public:  // DEPRECATED methods: please do NOT use in new code, and REPLACE in old code
     REAL __deprecated GetRotationSpeed();
@@ -100,32 +75,11 @@
     virtual void setupVisuals(gParserState &);
     virtual void readXML(tXmlParser::node const &);
 
-    eCoord          GetPosition         ( void ) const;	                //!< Gets the current position
-    zZone const &   GetPosition         ( eCoord & position ) const;	//!< Gets the current position
-    tCoord const    GetRotation         ( void ) const;	                //!< Gets the current rotation state
-    REAL            GetScale           ( void ) const;	                //!< Gets the current scale
-    rColor const    GetColor( void ) const;	//!< Gets the current color
-    /*
-    zZone &         SetPosition         ( eCoord const & position );	//!< Sets the current position
-    zZone &         SetVelocity         ( eCoord const & velocity );	//!< Sets the current velocity
-    eCoord          GetVelocity         ( void ) const;	                //!< Gets the current velocity
-    zZone const &   GetVelocity         ( eCoord & velocity ) const;	//!< Gets the current velocity
-    zZone &         SetScale           ( REAL scale );	            //!< Sets the current scale
-    REAL            GetScale           ( void ) const;	                //!< Gets the current scale
-    zZone const &   GetScale           ( REAL & scale ) const;	    //!< Gets the current scale
-    zZone &         SetExpansionSpeed   ( REAL expansionSpeed );	    //!< Sets the current expansion speed
-    REAL            GetExpansionSpeed   ( void ) const;	                //!< Gets the current expansion speed
-    zZone const &   GetExpansionSpeed   ( REAL & expansionSpeed ) const;//!< Gets the current expansion speed
-    zZone &         SetRotationSpeed    ( REAL rotationSpeed );	        //!< Sets the current rotation speed
-    REAL            GetRotationSpeed    ( void ) const;	                //!< Gets the current rotation speed
-    tCoord const &  GetRotation         ( void ) const;	                //!< Gets the current rotation state
-    zZone const &   GetRotationSpeed    ( REAL & rotationSpeed ) const;	//!< Gets the current rotation speed
-    zZone &         SetRotationAcceleration( REAL rotationAcceleration );	        //!< Sets the current acceleration of the rotation
-    REAL            GetRotationAcceleration( void ) const;	                        //!< Gets the current acceleration of the rotation
-    zZone const &   GetRotationAcceleration( REAL & rotationAcceleration ) const;	//!< Gets the current acceleration of the rotation
-    rColor const &  GetColor( void ) const;	//!< Gets the current color
-    void            SetColor( rColor const & color ); //!< Sets the current color
-    */
+    eCoord         __deprecated GetPosition         ( void ) const;	                //!< Gets the current position
+    zZone const &  __deprecated GetPosition         ( eCoord & position ) const;	//!< Gets the current position
+    tCoord const   __deprecated GetRotation         ( void ) const;	                //!< Gets the current rotation state
+    REAL           __deprecated GetScale           ( void ) const;	                //!< Gets the current scale
+    rColor const   __deprecated GetColor( void ) const;	//!< Gets the current color
 
     void addEffectGroupEnter  (zEffectGroupPtr anEffectGroup) {effectGroupEnter.push_back  (anEffectGroup);};
     void addEffectGroupInside (zEffectGroupPtr anEffectGroup) {effectGroupInside.push_back (anEffectGroup);};
@@ -135,30 +89,14 @@
     void setShape (zShapePtr aShape) { shape = aShape; };
     zShapePtr getShape() { return shape; };
 
-    // HACK
-    // Enables fortress described in maps from format 1 to be assigned to a team according to the old behavior
-    void setOldFortressAutomaticAssignmentBehavior(bool oldFortressAutomaticAssignmentBehavior)
-    {
-        oldFortressAutomaticAssignmentBehavior_ = oldFortressAutomaticAssignmentBehavior;
-    };
-    bool getOldFortressAutomaticAssignmentBehavior() { return oldFortressAutomaticAssignmentBehavior_; };
-
     void setName(string name) {name_ = name;};
     string getName() { return name_; };
 
 protected:
-    //    rColor color_;           //!< the zone's color
     REAL createTime_;            //!< the time the zone was created at
     zShapePtr shape; //!< the shape(s) of this zone
 
     REAL referenceTime_;         //!< reference time for function evaluations
-    /*
-    tFunction posx_;             //!< time dependence of x component of position
-    tFunction posy_;             //!< time dependence of y component of position
-    tFunction scale_;           //!< time dependence of scale
-    tFunction rotationSpeed_;    //!< the zone's rotation speed
-    eCoord    rotation_;         //!< the current rotation state
-    */
 
     virtual bool Timestep(REAL currentTime);     //!< simulates behaviour up to currentTime
     virtual void OnVanish();                     //!< called when the zone vanishes
@@ -183,15 +121,11 @@
     //! returns the descriptor responsible for this class
     virtual nNetObjectDescriptorBase const & DoGetDescriptor() const;
 
-    //    REAL Scale() const;           //!< returns the current scale
-
-    inline REAL EvaluateFunctionNow( tFunction const & f ) const;  //!< evaluates the given function with lastTime - referenceTime_ as argument
-    inline void SetFunctionNow( tFunction & f, REAL value ) const; //!< makes sure EvaluateFunctionNow() returns the given value
+    inline REAL __deprecated EvaluateFunctionNow( tFunction const & f ) const;  //!< evaluates the given function with lastTime - referenceTime_ as argument
+    inline void __deprecated SetFunctionNow( tFunction & f, REAL value ) const; //!< makes sure EvaluateFunctionNow() returns the given value
 
     void RemoveFromZoneList(void); //!< Removes the zone from the sg_Zones list if it's there
 
-    bool oldFortressAutomaticAssignmentBehavior_;
-
     string name_;
 
 };