Changeset 2041 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Spectator.cc

Timestamp:

Oct 29, 2008, 12:48:11 AM (16 years ago)

Author:

landauf

Message:

bugs—
network++
endurance—
tiredness++

but it still doesn't work properly
(commit because oli is very impatient)

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) (5 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -56 +56 @@
         this->roll_ = 0;
         this->setHudTemplate("spectatorhud");
+        this->hudmode_ = 0;
 
         this->setDestroyWhenPlayerLeft(true);
@@ -85 +86 @@
         REGISTERDATA(this->bGreetingFlareVisible_, network::direction::toclient, new network::NetworkCallback<Spectator>(this, &Spectator::changedFlareVisibility));
         REGISTERDATA(this->bGreeting_,             network::direction::toserver, new network::NetworkCallback<Spectator>(this, &Spectator::changedGreeting));
+        REGISTERDATA(this->hudmode_,               network::direction::toclient);
     }
 
@@ -100 +102 @@
     void Spectator::tick(float dt)
     {
+        this->updateHUD();
+
         if (this->isLocallyControlled())
         {
-            this->updateHUD();
-
             Vector3 velocity = this->getVelocity();
             velocity.normalise();
@@ -187 +189 @@
     {
         // <hack>
-        if (this->getHUD())
-        {
-            std::string text;
-
+        if (Core::isMaster())
+        {
             if (this->getPlayer() && this->getGametype())
             {
@@ -196 +196 @@
                 {
                     if (!this->getPlayer()->isReadyToSpawn())
-                        text = "Press [Fire] to start the match";
+                        this->hudmode_ = 0;
                     else
-                        text = "Waiting for other players";
+                        this->hudmode_ = 1;
                 }
                 else if (!this->getGametype()->hasEnded())
                 {
                     if (this->getGametype()->isStartCountdownRunning())
-                    {
-                        text = convertToString(ceil(this->getGametype()->getStartCountdown()));
-                    }
+                        this->hudmode_ = 2 + 10*ceil(this->getGametype()->getStartCountdown());
                     else
-                    {
-                        text = "Press [Fire] to respawn";
-                    }
+                        this->hudmode_ = 3;
                 }
                 else
-                {
+                    this->hudmode_ = 4;
+            }
+            else
+                return;
+        }
+
+        if (this->getHUD())
+        {
+            std::string text;
+            int hudmode = this->hudmode_ % 10;
+
+            switch (hudmode)
+            {
+                case 0:
+                    text = "Press [Fire] to start the match";
+                    break;
+                case 1:
+                    text = "Waiting for other players";
+                    break;
+                case 2:
+                    text = convertToString((this->hudmode_ - 2) / 10);
+                    break;
+                case 3:
+                    text = "Press [Fire] to respawn";
+                    break;
+                case 4:
                     text = "Game has ended";
-                }
-            }
-            else
-            {
-                return;
+                    break;
+                default:;
             }