Changeset 12180 for code/branches/Merge_HS18/src

Timestamp:

Dec 11, 2018, 2:52:30 PM (6 years ago)

Author:

merholzl

Message:

World Map merging

Location:

code/branches/Merge_HS18

Files:

• . (modified) (1 prop)
• src/modules/flappyorx/FlappyOrxShip.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefense.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseSelecter.cc (modified) (1 diff)
• src/orxonox/controllers/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/controllers/SMCoord.cc (copied) (copied from code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.cc)
• src/orxonox/controllers/SMCoord.h (copied) (copied from code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.h)
• src/orxonox/controllers/StoryModeController.cc (copied) (copied from code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc)
• src/orxonox/controllers/StoryModeController.h (copied) (copied from code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h)
• src/orxonox/gametypes/StoryMode.cc (modified) (2 diffs)

code/branches/Merge_HS18/src/modules/flappyorx/FlappyOrxShip.cc

@@ -38 +38 @@
 #include "graphics/Camera.h"
 #include "graphics/ParticleSpawner.h"
+#include "worldentities/pawns/SpaceShip.h"
 #include <math.h> 
 #include <ctime>

code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.cc

@@ -272 +272 @@
         if (hasStarted() == false || player_ == nullptr)
         {
+            orxout(internal_warning) << "Heere" << endl;
             return;
         }
+
+        orxout(internal_warning) << "2" << endl;
         timeUntilNextWave_ -= dt;
         timeSinceLastSpawn_ += dt;
@@ -280 +283 @@
         if (selecter != nullptr && selecter->buildTower_ == true)
         {
+             orxout(internal_warning) << "3" << endl;
             selecter->buildTower_ = false;
 

code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc

@@ -108 +108 @@
     void TowerDefenseSelecter::moveFrontBack(const Vector2& value)
     {
+        
         if (value.x > 0)
         {

code/branches/Merge_HS18/src/orxonox/controllers/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Controller.cc
+  StoryModeController.cc
+  SMCoord.cc
   HumanController.cc
   NewHumanController.cc
@@ -20 +22 @@
   MasterController.cc
   ArrowController.cc;
-  AutonomousDroneController.cc;
+  AutonomousDroneController.cc; 
+  StoryModeController.cc;
         
 )

code/branches/Merge_HS18/src/orxonox/gametypes/StoryMode.cc

@@ -47 +47 @@
     StoryMode::StoryMode(Context* context) : Gametype(context)
     {
+        
         RegisterObject(StoryMode);
 
@@ -65 +66 @@
     void StoryMode::exit()
     {
-        orxout() << "s funktioniert"<< endl;
+      
         for (StoryMode* mission : ObjectList<StoryMode>())
         { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!