[Orxonox-commit 4258] r8929 - in code/branches/hud: data/gui/scripts data/levels src/modules/overlays/hud src/orxonox/worldentities/pawns

[mspaling at orxonox.net]

Author: mspaling
Date: 2011-11-09 16:12:35 +0100 (Wed, 09 Nov 2011)
New Revision: 8929

Modified:
   code/branches/hud/data/gui/scripts/MiscConfigMenu.lua
   code/branches/hud/data/levels/underAttack.oxw
   code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc
   code/branches/hud/src/orxonox/worldentities/pawns/Pawn.cc
Log:
added xmlport for rvnames and misc menu options

Modified: code/branches/hud/data/gui/scripts/MiscConfigMenu.lua
===================================================================
--- code/branches/hud/data/gui/scripts/MiscConfigMenu.lua	2011-11-09 15:11:12 UTC (rev 8928)
+++ code/branches/hud/data/gui/scripts/MiscConfigMenu.lua	2011-11-09 15:12:35 UTC (rev 8929)
@@ -35,6 +35,8 @@
     table.insert(P.commandList, "HumanPlayer nick_")
     table.insert(P.commandList, "ChatOverlay displayTime_")
     table.insert(P.commandList, "Core bDevMode_")
+    table.insert(P.commandList, "HUDNavigation MarkerLimit_")
+    table.insert(P.commandList, "HUDNavigation showDistance")
 
     P.nameList = {}
     table.insert(P.nameList, "Mouse sensitivity")
@@ -55,6 +57,8 @@
     table.insert(P.nameList, "Playername")
     table.insert(P.nameList, "Chat: display time")
     table.insert(P.nameList, "Developer's Mode")
+    table.insert(P.nameList, "Marker Limit")
+    table.insert(P.nameList, "Show Distance next to cursor")
 
     P.linesList = {}
 

Modified: code/branches/hud/data/levels/underAttack.oxw
===================================================================
--- code/branches/hud/data/levels/underAttack.oxw	2011-11-09 15:11:12 UTC (rev 8928)
+++ code/branches/hud/data/levels/underAttack.oxw	2011-11-09 15:12:35 UTC (rev 8929)
@@ -50,6 +50,7 @@
       health            = 10000
       maxhealth         = 10000
       initialhealth     = 10000
+      RVName            = "Transporter"
     >
 
       <attached>

Modified: code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc	2011-11-09 15:11:12 UTC (rev 8928)
+++ code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc	2011-11-09 15:12:35 UTC (rev 8929)
@@ -63,6 +63,7 @@
 void HUDNavigation::setConfigValues()
 {
   SetConfigValue(markerLimit_, 3);
+  SetConfigValue(showDistance, false);
 }
 
 CreateFactory ( HUDNavigation );
@@ -77,7 +78,6 @@
     setFont ( "Monofur" );
     setTextSize ( 0.05f );
     setNavMarkerSize ( 0.05f );
-    this->showDistance = false;
 }
 
 HUDNavigation::~HUDNavigation()

Modified: code/branches/hud/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/hud/src/orxonox/worldentities/pawns/Pawn.cc	2011-11-09 15:11:12 UTC (rev 8928)
+++ code/branches/hud/src/orxonox/worldentities/pawns/Pawn.cc	2011-11-09 15:12:35 UTC (rev 8929)
@@ -128,6 +128,8 @@
 
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
+   
+        XMLPortParam ( RadarViewable, "RVName", setRVName, getRVName, xmlelement, mode );
     }
 
     void Pawn::registerVariables()