Changeset 11746 for code/branches/Presentation_HS17_merge

Timestamp:

Feb 15, 2018, 12:11:35 AM (7 years ago)

Author:

landauf

Message:

removed some more occurrences of "Map" (a class that doesn't seem to exist)

Location:

code/branches/Presentation_HS17_merge

Files:

• data/overlays/HUDTemplatesFPS.oxo (modified) (1 diff)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/interfaces/RadarViewable.h (modified) (1 diff)

code/branches/Presentation_HS17_merge/data/overlays/HUDTemplatesFPS.oxo

@@ -1 +1 @@
 <Template name="fpshud">
   <OverlayGroup name = "fpshud" scale = "1, 1">
-    <Map />
-
     <HUDHealthBar
      name              = "HealthBar1"

code/branches/Presentation_HS17_merge/src/orxonox/OrxonoxPrereqs.h

@@ -152 +152 @@
     // overlays
     class InGameConsole;
-    class Map;
     class OrxonoxOverlay;
     class OverlayGroup;

code/branches/Presentation_HS17_merge/src/orxonox/controllers/HumanController.h

@@ -90 +90 @@
                 { return HumanController::localController_s; }
             static Pawn* getLocalControllerEntityAsPawn();
-            //friend class, for mouselook
-            friend class Map;
 
         protected:

code/branches/Presentation_HS17_merge/src/orxonox/interfaces/RadarViewable.h

@@ -151 +151 @@
             return this->uniqueId_;
         }
-        //friend class Map;
 
     private: