[Orxonox-commit 4287] r8958 - in code/branches/menue: data/levels src/orxonox
baermatt at orxonox.net
baermatt at orxonox.net
Wed Dec 7 14:21:25 CET 2011
Author: baermatt
Date: 2011-12-07 14:21:24 +0100 (Wed, 07 Dec 2011)
New Revision: 8958
Modified:
code/branches/menue/data/levels/FPSTest.oxw
code/branches/menue/data/levels/asteroids.oxw
code/branches/menue/data/levels/docking.oxw
code/branches/menue/data/levels/dynamicMatch.oxw
code/branches/menue/data/levels/earth.oxw
code/branches/menue/data/levels/emptyLevel.oxw
code/branches/menue/data/levels/events.oxw
code/branches/menue/data/levels/fightInOurBack.oxw
code/branches/menue/data/levels/lastManStanding.oxw
code/branches/menue/data/levels/lastTeamStanding.oxw
code/branches/menue/data/levels/lastTeamStandingII.oxw
code/branches/menue/data/levels/myTestLevel.oxw
code/branches/menue/data/levels/notifications.oxw
code/branches/menue/data/levels/pickups.oxw
code/branches/menue/data/levels/pirateAttack.oxw
code/branches/menue/data/levels/planets.oxw
code/branches/menue/data/levels/pong.oxw
code/branches/menue/data/levels/portals.oxw
code/branches/menue/data/levels/presentation.oxw
code/branches/menue/data/levels/presentation09.oxw
code/branches/menue/data/levels/presentation09b.oxw
code/branches/menue/data/levels/presentationDM.oxw
code/branches/menue/data/levels/presentationFS10.oxw
code/branches/menue/data/levels/presentationFS102.oxw
code/branches/menue/data/levels/presentationFS10Ed.oxw
code/branches/menue/data/levels/presentationFS11.oxw
code/branches/menue/data/levels/presentationHS09.oxw
code/branches/menue/data/levels/presentationHS09b.oxw
code/branches/menue/data/levels/princessAeryn.oxw
code/branches/menue/data/levels/quests.oxw
code/branches/menue/data/levels/screenshot.oxw
code/branches/menue/data/levels/shieldTest.oxw
code/branches/menue/data/levels/sound.oxw
code/branches/menue/data/levels/spaceRace.oxw
code/branches/menue/data/levels/teamBaseMatch.oxw
code/branches/menue/data/levels/teamDeathMatch.oxw
code/branches/menue/data/levels/testStars.oxw
code/branches/menue/data/levels/testSwallow.oxw
code/branches/menue/data/levels/tetris.oxw
code/branches/menue/data/levels/theTimeMachine.oxw
code/branches/menue/data/levels/tutorial.oxw
code/branches/menue/data/levels/underAttack.oxw
code/branches/menue/data/levels/waypoints.oxw
code/branches/menue/src/orxonox/Level.cc
code/branches/menue/src/orxonox/Level.h
Log:
Removing unused Level attributes.
Modified: code/branches/menue/data/levels/FPSTest.oxw
===================================================================
--- code/branches/menue/data/levels/FPSTest.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/FPSTest.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -14,10 +14,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "fps"
- description = "tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/asteroids.oxw
===================================================================
--- code/branches/menue/data/levels/asteroids.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/asteroids.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -13,9 +13,7 @@
?>
<Level
- name = "Asteroids Race"
- description = "Reach the checkpoints and avoid asteroids."
- gametype = Asteroids
+ gametype = "Asteroids"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/docking.oxw
===================================================================
--- code/branches/menue/data/levels/docking.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/docking.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -12,10 +12,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Transporter"
- description = "Docking example level"
->
+<Level>
<templates>
<Template link="lodtemplate_default" />
</templates>
Modified: code/branches/menue/data/levels/dynamicMatch.oxw
===================================================================
--- code/branches/menue/data/levels/dynamicMatch.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/dynamicMatch.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -15,9 +15,7 @@
?>
<Level
- name = "Dynamic Match"
- description = "In progress -level for dynamicmatch"
- gametype = "Dynamicmatch"
+ gametype = "Dynamicmatch"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/earth.oxw
===================================================================
--- code/branches/menue/data/levels/earth.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/earth.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -12,10 +12,7 @@
include("templates/spaceshipHXY.oxt")
?>
-<Level
- name = "Planet Earth"
- description = "1:100 Scale Model of Earth with Gravity"
->
+<Level>
<templates>
<Template link="lodtemplate_default" />
</templates>
Modified: code/branches/menue/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/menue/data/levels/emptyLevel.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/emptyLevel.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -16,10 +16,7 @@
include("templates/spaceshipPirate.oxt")
?>
-<Level
- name = "Sample"
- description = "Just a few tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/events.oxw
===================================================================
--- code/branches/menue/data/levels/events.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/events.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -13,10 +13,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Event testing"
- description = "A simple level to test the event-system (with comments)"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/fightInOurBack.oxw
===================================================================
--- code/branches/menue/data/levels/fightInOurBack.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/fightInOurBack.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -108,9 +108,7 @@
</Template>
<!--*****************************************************************************************************************************************************************************************-->
<Level
- name="Fight in our back"
- description="Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
- gametype=TeamDeathmatch
+ gametype = "TeamDeathmatch"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/lastManStanding.oxw
===================================================================
--- code/branches/menue/data/levels/lastManStanding.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/lastManStanding.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -16,9 +16,7 @@
?>
<Level
- name = "Last Man Standing"
- description = "testmap for gametype last man standing"
- gametype = "LastManStanding"
+ gametype = "LastManStanding"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/lastTeamStanding.oxw
===================================================================
--- code/branches/menue/data/levels/lastTeamStanding.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/lastTeamStanding.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -15,9 +15,7 @@
?>
<Level
- name = "Last Team Standing"
- description = "testmap for gametype last team standing"
- gametype = "LastTeamStanding"
+ gametype = "LastTeamStanding"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/lastTeamStandingII.oxw
===================================================================
--- code/branches/menue/data/levels/lastTeamStandingII.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/lastTeamStandingII.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -15,9 +15,7 @@
?>
<Level
- name = "On the fly"
- description = "testmap for gametype last team standing"
- gametype = "LastTeamStanding"
+ gametype = "LastTeamStanding"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/myTestLevel.oxw
===================================================================
--- code/branches/menue/data/levels/myTestLevel.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/myTestLevel.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -16,10 +16,7 @@
include("templates/spaceshipPirate.oxt")
?>
-<Level
- name = "Sample"
- description = "Just a few tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/notifications.oxw
===================================================================
--- code/branches/menue/data/levels/notifications.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/notifications.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -12,10 +12,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Presentation"
- description = "A simple testlevel"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/pickups.oxw
===================================================================
--- code/branches/menue/data/levels/pickups.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/pickups.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -16,10 +16,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Sample"
- description = "Just a few tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/pirateAttack.oxw
===================================================================
--- code/branches/menue/data/levels/pirateAttack.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/pirateAttack.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -26,9 +26,7 @@
?>
<Level
-name="Dani's Testlevel"
-description="Erste Versuche mit den Quests"
-gametype=TeamDeathmatch
+ gametype = "TeamDeathmatch"
>
<templates>
Modified: code/branches/menue/data/levels/planets.oxw
===================================================================
--- code/branches/menue/data/levels/planets.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/planets.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -12,10 +12,7 @@
include("templates/spaceshipHXY.oxt")
?>
-<Level
- name = "Planet"
- description = "Demonstration of Planets"
->
+<Level>
<templates>
<Template link="lodtemplate_default" />
</templates>
Modified: code/branches/menue/data/levels/pong.oxw
===================================================================
--- code/branches/menue/data/levels/pong.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/pong.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -49,9 +49,7 @@
<Level
- name = "Pong"
- description = "Pong in space!"
- gametype = Pong
+ gametype = "Pong"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/portals.oxw
===================================================================
--- code/branches/menue/data/levels/portals.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/portals.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -14,10 +14,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Presentation"
- description = "A simple testlevel"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/presentation.oxw
===================================================================
--- code/branches/menue/data/levels/presentation.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentation.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -12,10 +12,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Sample"
- description = "Just a few tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/presentation09.oxw
===================================================================
--- code/branches/menue/data/levels/presentation09.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentation09.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -13,11 +13,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Presentation09"
- description = "presentation level for Orxonox Convention X"
-
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/presentation09b.oxw
===================================================================
--- code/branches/menue/data/levels/presentation09b.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentation09b.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -16,9 +16,7 @@
?>
<Level
- name = "Presentation09"
- description = "presentation level for Orxonox Convention X"
- gametype = TeamDeathmatch
+ gametype = "TeamDeathmatch"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/presentationDM.oxw
===================================================================
--- code/branches/menue/data/levels/presentationDM.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentationDM.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -14,9 +14,7 @@
?>
<Level
- name = "Presentation"
- description = "A simple testlevel"
- gametype = Deathmatch
+ gametype = "Deathmatch"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/presentationFS10.oxw
===================================================================
--- code/branches/menue/data/levels/presentationFS10.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentationFS10.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -19,9 +19,7 @@
?>
<Level
- name = "Sample"
- description = "Just a few tests"
- gametype = TeamDeathmatch
+ gametype = "TeamDeathmatch"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/presentationFS102.oxw
===================================================================
--- code/branches/menue/data/levels/presentationFS102.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentationFS102.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -14,10 +14,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "fps"
- description = "tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/presentationFS10Ed.oxw
===================================================================
--- code/branches/menue/data/levels/presentationFS10Ed.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentationFS10Ed.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -14,10 +14,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "fps"
- description = "tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/presentationFS11.oxw
===================================================================
--- code/branches/menue/data/levels/presentationFS11.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentationFS11.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -21,10 +21,7 @@
include("templates/pickupRepresentationTemplates.oxt")
?>
-<Level
- name = "Sample"
- description = "Just a few tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/presentationHS09.oxw
===================================================================
--- code/branches/menue/data/levels/presentationHS09.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentationHS09.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -16,9 +16,7 @@
?>
<Level
- name = "Presentation09"
- description = "presentation level for Orxonox Convention X"
- gametype = TeamDeathmatch
+ gametype = "TeamDeathmatch"
hasPhysics = true
>
<templates>
Modified: code/branches/menue/data/levels/presentationHS09b.oxw
===================================================================
--- code/branches/menue/data/levels/presentationHS09b.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/presentationHS09b.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -22,9 +22,7 @@
?>
<Level
- name = "Sample"
- description = "Just a few tests"
- gametype = TeamDeathmatch
+ gametype = "TeamDeathmatch"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/princessAeryn.oxw
===================================================================
--- code/branches/menue/data/levels/princessAeryn.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/princessAeryn.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -16,10 +16,7 @@
dofile("includes/CuboidSpaceStation.lua")
?>
-<Level
- name = "The Tale of Princess Aeryn"
- description = "The Tale of Princess Aeryn"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/quests.oxw
===================================================================
--- code/branches/menue/data/levels/quests.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/quests.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -12,10 +12,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Questsystem"
- description = "Just a few tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/screenshot.oxw
===================================================================
--- code/branches/menue/data/levels/screenshot.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/screenshot.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -15,9 +15,7 @@
?>
<Level
- name = "Waypoints"
- description = "Testing waypoings for AI controlled spaceships."
- gametype = TeamDeathmatch
+ gametype = "TeamDeathmatch"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/shieldTest.oxw
===================================================================
--- code/branches/menue/data/levels/shieldTest.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/shieldTest.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -12,10 +12,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "shieldTL"
- description = "LEVEL-DESCRIPTION"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/sound.oxw
===================================================================
--- code/branches/menue/data/levels/sound.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/sound.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -16,10 +16,7 @@
include("templates/spaceshipPirate.oxt")
?>
-<Level
- name = "Sample"
- description = "Just a few tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/spaceRace.oxw
===================================================================
--- code/branches/menue/data/levels/spaceRace.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/spaceRace.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -17,9 +17,7 @@
?>
<Level
- name = "Space Race"
- description = "Test level for the gametype Space Race."
- gametype = SpaceRace
+ gametype = "SpaceRace"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/teamBaseMatch.oxw
===================================================================
--- code/branches/menue/data/levels/teamBaseMatch.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/teamBaseMatch.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -15,9 +15,7 @@
?>
<Level
- name = "Teambase Match"
- description = "Fight for the bases."
- gametype = TeamBaseMatch
+ gametype = "TeamBaseMatch"
>
<templates>
Modified: code/branches/menue/data/levels/teamDeathMatch.oxw
===================================================================
--- code/branches/menue/data/levels/teamDeathMatch.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/teamDeathMatch.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -15,9 +15,7 @@
?>
<Level
- name = "Team Deathmatch"
- description = "Fight against each other in teams."
- gametype = TeamDeathmatch
+ gametype = "TeamDeathmatch"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/testStars.oxw
===================================================================
--- code/branches/menue/data/levels/testStars.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/testStars.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -16,10 +16,7 @@
include("templates/spaceshipPirate.oxt")
?>
-<Level
- name = "Sample"
- description = "Just a few tests"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/testSwallow.oxw
===================================================================
--- code/branches/menue/data/levels/testSwallow.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/testSwallow.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -13,12 +13,8 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Presentation_swallow"
- description = "presentation level for Orxonox Convention X"
+<Level>
->
-
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/tetris.oxw
===================================================================
--- code/branches/menue/data/levels/tetris.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/tetris.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -30,9 +30,7 @@
</Template>
<Level
- name = "Tetris"
- description = "Tetris in space!"
- gametype = "Tetris"
+ gametype = "Tetris"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/theTimeMachine.oxw
===================================================================
--- code/branches/menue/data/levels/theTimeMachine.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/theTimeMachine.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -61,9 +61,7 @@
<!--*****************************************************************************************************************************************************************************************-->
<Level
- name="The Time Machine"
- description="A simple level. The only goal is to defeat as much enemies as you can."
- gametype=TeamDeathmatch
+ gametype = "TeamDeathmatch"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/tutorial.oxw
===================================================================
--- code/branches/menue/data/levels/tutorial.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/tutorial.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -12,10 +12,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Presentation"
- description = "A simple testlevel"
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/data/levels/underAttack.oxw
===================================================================
--- code/branches/menue/data/levels/underAttack.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/underAttack.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -14,9 +14,7 @@
?>
<Level
- name = "Under Attack"
- description = "Fight against the transporter."
- gametype = UnderAttack
+ gametype = "UnderAttack"
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/menue/data/levels/waypoints.oxw
===================================================================
--- code/branches/menue/data/levels/waypoints.oxw 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/data/levels/waypoints.oxw 2011-12-07 13:21:24 UTC (rev 8958)
@@ -14,10 +14,7 @@
include("templates/lodInformation.oxt")
?>
-<Level
- name = "Waypoints"
- description = "Testing waypoings for AI controlled spaceships."
->
+<Level>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/menue/src/orxonox/Level.cc
===================================================================
--- code/branches/menue/src/orxonox/Level.cc 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/src/orxonox/Level.cc 2011-12-07 13:21:24 UTC (rev 8958)
@@ -70,7 +70,6 @@
{
SUPER(Level, XMLPort, xmlelement, mode);
- XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode);
XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
@@ -81,7 +80,6 @@
{
registerVariable(this->xmlfilename_, VariableDirection::ToClient, new NetworkCallback<Level>(this, &Level::networkcallback_applyXMLFile));
registerVariable(this->name_, VariableDirection::ToClient, new NetworkCallback<Level>(this, &Level::changedName));
- registerVariable(this->description_, VariableDirection::ToClient);
registerVariable(this->networkTemplateNames_, VariableDirection::ToClient, new NetworkCallback<Level>(this, &Level::networkCallbackTemplatesChanged));
}
Modified: code/branches/menue/src/orxonox/Level.h
===================================================================
--- code/branches/menue/src/orxonox/Level.h 2011-12-07 12:50:40 UTC (rev 8957)
+++ code/branches/menue/src/orxonox/Level.h 2011-12-07 13:21:24 UTC (rev 8958)
@@ -48,11 +48,6 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- inline void setDescription(const std::string& description)
- { this->description_ = description; }
- inline const std::string& getDescription() const
- { return this->description_; }
-
void playerEntered(PlayerInfo* player);
void playerLeft(PlayerInfo* player);
@@ -75,7 +70,6 @@
void networkcallback_applyXMLFile();
- std::string description_;
std::string gametype_;
std::string xmlfilename_;
XMLFile* xmlfile_;
More information about the Orxonox-commit
mailing list