Changeset 11774 for code/branches/Presentation_HS17_merge/src/modules

Timestamp:

Feb 18, 2018, 6:42:50 PM (7 years ago)

Author:

landauf

Message:

merged Waypoints_HS17

Location:

code/branches/Presentation_HS17_merge

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDWaypoints.cc (copied) (copied from code/branches/Waypoints_HS17/src/modules/overlays/hud/HUDWaypoints.cc)
• src/modules/overlays/hud/HUDWaypoints.h (copied) (copied from code/branches/Waypoints_HS17/src/modules/overlays/hud/HUDWaypoints.h)
• src/modules/questsystem/Quest.cc (modified) (1 diff)

code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt

@@ -11 +11 @@
   HUDEnemyHealthBar.cc
   HUDEnemyShieldBar.cc
+  HUDWaypoints.cc
   HUDWeaponMode.cc
   HUDWeapon.cc

code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc

@@ -80 +80 @@
         XMLPortObject(Quest, QuestEffect, "fail-effects", addFailEffect, getFailEffect, xmlelement, mode);
         XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode);
+        //XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode);
 
         QuestManager::getInstance().registerQuest(this); // Registers the Quest with the QuestManager.
     }
+
+
+    /*bool Quest::addArrowTarget(Quest* quest){
+
+        assert(quest);
+
+
+    }*/
+
+
 
     /**