Merge lp:~luke-jr/armagetronad/armagetronad-net-vulnerable-blinking into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work

[Luke-Jr]

[Luke-Jr (luke-jr)]

gCycle::ReadSync is somewhat complex-- could someone make sure this looks sane?

[Manuel Moos (z-man)]

Looks basically fine. Just one problem:
syncs of other cycles that don't make turns are sent to the client once per second, and if the cycle turns vulnerable right after a sync, there's a potential one second delay between the change and the clients noticing it. Quick fix: comment out the sync writing of the two flags for now, as long as the clients have the correct logic implemented, its not needed. Only when the server decides to change the invulnerability logic, it would be needed to add a 'if blinking/vulnerability changed since the last frame, send a sync' bit in the timestep function. Move the branch to ~/armagetronad-dev and I'll take care of that right now, the timestep logic is kind of involved (lots of functions called TimestepSomething in gCycle and gCycleMovement).

review: Needs Fixing

[Luke-Jr (luke-jr)]

Branched to lp:~armagetronad-dev/armagetronad/armagetronad-net-vulnerable-blinking

Unmerged revisions

895. By Luke-Jr on 2009-03-12

support syncing is-blinking over the network

894. By Luke-Jr on 2009-03-12

move is-blinking logic to a function

893. By Luke-Jr on 2009-03-12

allow server to determine when a cycle is or is not Vulnerable

=== modified file 'src/protobuf/gCycle.proto'
--- src/protobuf/gCycle.proto	2009-02-03 10:53:00 +0000
+++ src/protobuf/gCycle.proto	2009-03-12 18:42:56 +0000
@@ -79,4 +79,7 @@
     optional bool legacy_sync_end = 20001;
 
     // extensions go here
+
+    optional bool vulnerable = 20;
+    optional bool blinking = 21;
 }
 
=== modified file 'src/tron/gCycle.cpp'
--- src/tron/gCycle.cpp	2009-03-04 16:57:04 +0000
+++ src/tron/gCycle.cpp	2009-03-12 18:42:56 +0000
@@ -25,6 +25,8 @@
 
 */
 
+#include <boost/logic/tribool.hpp>
+
 #include "eEventNotification.h"
 #include "gCycle.h"
 #include "nConfig.h"
@@ -4268,7 +4270,7 @@
 
     // are we blinking from invulnerability?
     bool blinking = false;
-    if ( lastTime > spawnTime_ && !Vulnerable() )
+    if ( Blinking() )
     {
         double time = tSysTimeFloat();
         double wrap = time - floor(time);
@@ -5080,6 +5082,9 @@
     sync.set_turns(turns);
     sync.set_braking(braking);
 
+    sync.set_vulnerable( Vulnerable() );
+    sync.set_blinking( Blinking() );
+
     // write last turn position
     GetLastTurnPos().WriteSync( *sync.mutable_last_turn_position() );
 
@@ -5421,6 +5426,11 @@
         sync.lastTurn = currentWall->beg;
     }
 
+    if ( syncX.has_vulnerable() )
+        vulnerable_ = syncX.vulnerable();
+    if ( syncX.has_blinking() )
+        blinking_ = syncX.blinking();
+
     bool canUseExtrapolatorMethod = false;
 
     bool rubberSent = false;
@@ -6200,5 +6210,14 @@
 
 bool gCycle::Vulnerable() const
 {
+    if (!boost::logic::indeterminate(vulnerable_))
+        return vulnerable_;
     return Alive() && lastTime > spawnTime_ + sg_cycleInvulnerableTime;
 }
+
+bool gCycle::Blinking() const
+{
+    if (!boost::logic::indeterminate(blinking_))
+        return blinking_;
+    return lastTime > spawnTime_ && !Vulnerable();
+}
 
=== modified file 'src/tron/gCycle.h'
--- src/tron/gCycle.h	2009-02-12 21:25:13 +0000
+++ src/tron/gCycle.h	2009-03-12 18:42:56 +0000
@@ -30,6 +30,8 @@
 
 //#define USE_HEADLIGHT
 
+#include <boost/logic/tribool.hpp>
+
 #include "gStuff.h"
 //#include "rTexture.h"
 //#include "rModel.h"
@@ -163,6 +165,10 @@
     std::auto_ptr< gCycleChatBot > chatBot_;
 
     bool dropWallRequested_; //!< flag indicating that someone requested a wall drop
+
+    boost::logic::tribool vulnerable_;
+    boost::logic::tribool blinking_;
+
 public:
     eCoord            lastGoodPosition_;    // the location of the last known good position
 
@@ -245,6 +251,7 @@
     int WindingNumber() const {return windingNumber_;}
 
     virtual bool            Vulnerable              ()                                    const     ;   //!< returns whether the cycle can be killed
+    virtual bool Blinking() const;  //!< returns whether the cycle should blink
 
     // bool CanMakeTurn() const { return pendingTurns <= 0 && lastTime >= nextTurn; }