[Orxonox-commit 4702] r9373 - in code/branches/release2012: data/gui/scripts data/levels src/orxonox

[jo at orxonox.net]

Author: jo
Date: 2012-09-06 16:40:00 +0200 (Thu, 06 Sep 2012)
New Revision: 9373

Modified:
   code/branches/release2012/data/gui/scripts/HostMenu.lua
   code/branches/release2012/data/levels/asteroids.oxw
   code/branches/release2012/data/levels/missionOne.oxw
   code/branches/release2012/data/levels/spaceRace.oxw
   code/branches/release2012/data/levels/surfaceRace.oxw
   code/branches/release2012/data/levels/tetris.oxw
   code/branches/release2012/data/levels/theTimeMachine.oxw
   code/branches/release2012/src/orxonox/LevelInfo.cc
Log:
On the way to adjust multiplayermenue. Levels tagged with singleplayer should NOT be displayed in the multiplayermenue.

Modified: code/branches/release2012/data/gui/scripts/HostMenu.lua
===================================================================
--- code/branches/release2012/data/gui/scripts/HostMenu.lua	2012-09-06 13:00:38 UTC (rev 9372)
+++ code/branches/release2012/data/gui/scripts/HostMenu.lua	2012-09-06 14:40:00 UTC (rev 9373)
@@ -62,7 +62,7 @@
     while index < size do
         level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
         if level ~= nil then
-            if P.showAll or not level:hasTag("test") then
+            if P.showAll or not level:hasTag("test") or not level:hasTag("singleplayer") then
                 table.insert(P.levelList, level)
             end
         end

Modified: code/branches/release2012/data/levels/asteroids.oxw
===================================================================
--- code/branches/release2012/data/levels/asteroids.oxw	2012-09-06 13:00:38 UTC (rev 9372)
+++ code/branches/release2012/data/levels/asteroids.oxw	2012-09-06 14:40:00 UTC (rev 9373)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Asteroids Race"
  description = "Reach the checkpoints and avoid asteroids."
- tags = "gametype"
+ tags = "gametype, singleplayer"
  screenshot = "asteroids.png"
 />
 

Modified: code/branches/release2012/data/levels/missionOne.oxw
===================================================================
--- code/branches/release2012/data/levels/missionOne.oxw	2012-09-06 13:00:38 UTC (rev 9372)
+++ code/branches/release2012/data/levels/missionOne.oxw	2012-09-06 14:40:00 UTC (rev 9373)
@@ -2,7 +2,7 @@
  name = "Mission One"
  description = "First Guided Steps in the Orxonoxian Universe."
  screenshot = "missionOne.png"
- tags = "mission"
+ tags = "mission, singleplayer"
 />
 
 <?lua

Modified: code/branches/release2012/data/levels/spaceRace.oxw
===================================================================
--- code/branches/release2012/data/levels/spaceRace.oxw	2012-09-06 13:00:38 UTC (rev 9372)
+++ code/branches/release2012/data/levels/spaceRace.oxw	2012-09-06 14:40:00 UTC (rev 9373)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Old Space Race"
  description = "Have a furious Race in Space: Reach the checkpoints as fast as possible."
- tags = "gametype"
+ tags = "gametype, singleplayer"
  screenshot = "spacerace.png"
 />
 

Modified: code/branches/release2012/data/levels/surfaceRace.oxw
===================================================================
--- code/branches/release2012/data/levels/surfaceRace.oxw	2012-09-06 13:00:38 UTC (rev 9372)
+++ code/branches/release2012/data/levels/surfaceRace.oxw	2012-09-06 14:40:00 UTC (rev 9373)
@@ -7,7 +7,7 @@
  name = "Surface Race"
  description = "Race on a planet's surface. Try to reach the goal in 70 Seconds."
  screenshot = "surfaceRace.png"
- tags = "gametype"
+ tags = "gametype, singleplayer"
 />
 
 <?lua

Modified: code/branches/release2012/data/levels/tetris.oxw
===================================================================
--- code/branches/release2012/data/levels/tetris.oxw	2012-09-06 13:00:38 UTC (rev 9372)
+++ code/branches/release2012/data/levels/tetris.oxw	2012-09-06 14:40:00 UTC (rev 9373)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Tetris"
  description = "Tetris in space!"
- tags = "minigame"
+ tags = "minigame, singleplayer"
  screenshot = "tetris.png"
 />
 

Modified: code/branches/release2012/data/levels/theTimeMachine.oxw
===================================================================
--- code/branches/release2012/data/levels/theTimeMachine.oxw	2012-09-06 13:00:38 UTC (rev 9372)
+++ code/branches/release2012/data/levels/theTimeMachine.oxw	2012-09-06 14:40:00 UTC (rev 9373)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "The Time Machine"
  description = "A simple level. The only goal is to defeat as much enemies as you can."
- tags = "gametype"
+ tags = "gametype, singleplayer"
  screenshot = "thetimemachine.png"
 />
 

Modified: code/branches/release2012/src/orxonox/LevelInfo.cc
===================================================================
--- code/branches/release2012/src/orxonox/LevelInfo.cc	2012-09-06 13:00:38 UTC (rev 9372)
+++ code/branches/release2012/src/orxonox/LevelInfo.cc	2012-09-06 14:40:00 UTC (rev 9373)
@@ -93,6 +93,7 @@
             LevelInfoItem::possibleTags_s.insert("gametype");
             LevelInfoItem::possibleTags_s.insert("minigame");
             LevelInfoItem::possibleTags_s.insert("shipselection");
+            LevelInfoItem::possibleTags_s.insert("singleplayer");
         }
     }