Changeset 11416 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc

Timestamp:

May 11, 2017, 3:18:27 PM (7 years ago)

Author:

jkindle

Message:

Added the animation for the level end (walk into castle), Coins for the blocks, Castleblocks and Flagblocks

File:

• code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc (modified) (8 diffs)

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Julien Kindle
  *   Co-authors:
- *      ...
+ *      
  *
  */
 
 /**
-    @file Pong.cc
-    @brief Implementation of the Pong class.
+    @file SOB.cc
+    @brief Implementation of the SOB class.
 */
 
 #include "SOB.h"
-
 #include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
@@ -39 +38 @@
 #include "core/config/ConfigValueIncludes.h"
 #include "core/Game.h"
-
 #include "gamestates/GSLevel.h"
 #include "chat/ChatManager.h"
 #include "infos/PlayerInfo.h"
-
 #include "SOBCenterpoint.h"
-
 #include "SOBFigure.h"
 #include "graphics/Camera.h"
+
+
 
 namespace orxonox
@@ -89 +87 @@
     }
 
+
+
     void SOB::start()
     {
@@ -95 +95 @@
             if (figure_ == nullptr)
             {
-                figure_ = new SOBFigure(center_->getContext());
+                figure_ = new SOBFigure(center_->getContext());     //add a new instance of a player to the game
                 figure_->addTemplate(center_->getFigureTemplate());
-               // figure_->InitializeAnimation(center_->getContext()); //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
             }
 
@@ -124 +123 @@
         cleanup();
         GSLevel::startMainMenu();
-
         Deathmatch::end();
     }
@@ -131 +129 @@
         cleanup();
 
-        // HACK
+        // HACK - only method I found to simply reload the level
         Game::getInstance().popState();
         Game::getInstance().popState();
@@ -144 +142 @@
         if (figure_->getPlayer() == nullptr)
         {
-            player->startControl(figure_);
+            player->startControl(figure_); //Give the control of the instance player to the real person
             players_[player].state_ = PlayerState::Alive;
         }
@@ -165 +163 @@
         SUPER(SOB, tick, dt);
 
-        if (this->figure_ != nullptr && figure_->dead_) {
+        //If player has reached end of level
+        if (this->figure_ != nullptr && figure_->lvlEnded_) {
+            std::stringstream a;
+            a << "Nice! " << getPoints() << " Points. Press <Space> to restart";
+            info_ =a.str();
+
+        //If player has died
+        } else if (this->figure_ != nullptr && figure_->dead_) {
             info_ = "Game over. Press <Space> to restart";
-            orxout() << "DEED" << endl;
         }
         
 
+        //Kill the player if time is up
+        if (this->figure_ != nullptr && timeLeft_ <= 0)
+            this->figure_->dead_ = true;
+        //The time on the HUD
         timeLeft_-=dt*2.5;
     }