[Orxonox-commit 7129] r11746 - in code/branches/Presentation_HS17_merge: data/overlays src/orxonox src/orxonox/controllers src/orxonox/interfaces

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-15 00:11:35 +0100 (Thu, 15 Feb 2018)
New Revision: 11746

Modified:
   code/branches/Presentation_HS17_merge/data/overlays/HUDTemplatesFPS.oxo
   code/branches/Presentation_HS17_merge/src/orxonox/OrxonoxPrereqs.h
   code/branches/Presentation_HS17_merge/src/orxonox/controllers/HumanController.h
   code/branches/Presentation_HS17_merge/src/orxonox/interfaces/RadarViewable.h
Log:
removed some more occurrences of "Map" (a class that doesn't seem to exist)

Modified: code/branches/Presentation_HS17_merge/data/overlays/HUDTemplatesFPS.oxo
===================================================================
--- code/branches/Presentation_HS17_merge/data/overlays/HUDTemplatesFPS.oxo	2018-02-14 23:11:04 UTC (rev 11745)
+++ code/branches/Presentation_HS17_merge/data/overlays/HUDTemplatesFPS.oxo	2018-02-14 23:11:35 UTC (rev 11746)
@@ -1,7 +1,5 @@
 <Template name="fpshud">
   <OverlayGroup name = "fpshud" scale = "1, 1">
-    <Map />
-
     <HUDHealthBar
      name              = "HealthBar1"
      background        = "Orxonox/HealthBarBackground"

Modified: code/branches/Presentation_HS17_merge/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/OrxonoxPrereqs.h	2018-02-14 23:11:04 UTC (rev 11745)
+++ code/branches/Presentation_HS17_merge/src/orxonox/OrxonoxPrereqs.h	2018-02-14 23:11:35 UTC (rev 11746)
@@ -151,7 +151,6 @@
 
     // overlays
     class InGameConsole;
-    class Map;
     class OrxonoxOverlay;
     class OverlayGroup;
 

Modified: code/branches/Presentation_HS17_merge/src/orxonox/controllers/HumanController.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/controllers/HumanController.h	2018-02-14 23:11:04 UTC (rev 11745)
+++ code/branches/Presentation_HS17_merge/src/orxonox/controllers/HumanController.h	2018-02-14 23:11:35 UTC (rev 11746)
@@ -89,8 +89,6 @@
             static inline HumanController* getLocalControllerSingleton()
                 { return HumanController::localController_s; }
             static Pawn* getLocalControllerEntityAsPawn();
-            //friend class, for mouselook
-            friend class Map;
 
         protected:
             static HumanController* localController_s;

Modified: code/branches/Presentation_HS17_merge/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/interfaces/RadarViewable.h	2018-02-14 23:11:04 UTC (rev 11745)
+++ code/branches/Presentation_HS17_merge/src/orxonox/interfaces/RadarViewable.h	2018-02-14 23:11:35 UTC (rev 11746)
@@ -150,7 +150,6 @@
         {
             return this->uniqueId_;
         }
-        //friend class Map;
 
     private:
         void validate(const WorldEntity* object) const;