Changeset 3625

Timestamp:

Feb 2, 2006, 11:23:56 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: level's LoadImage is loadable within the level instead of the Campaign file

Location:

data/trunk/worlds

Files:

• DefaultCampaign.oxc (modified) (1 diff)
• DefaultWorld.oxw (modified) (1 diff)
• Straight.oxw (modified) (1 diff)
• World2.oxw (modified) (1 diff)
• christmas.oxw (modified) (1 diff)
• vulcania.oxw (modified) (1 diff)

data/trunk/worlds/DefaultCampaign.oxc

@@ -6 +6 @@
     <SimpleGameMenu>
       <identifier>0</identifier>
-      <name>World1</name>
+      <name>GameMenu</name>
       <nextid>1</nextid>
       <path>worlds/SimpleMenu.oxw</path>
     </SimpleGameMenu>
+
     <SinglePlayerWorld>
       <identifier>1</identifier>
-      <name>World2</name>
       <nextid>2</nextid>
       <path>worlds/Straight.oxw</path>
-      <menu-entry>1</menu-entry>
-      <menu-item-image>pictures/menu/se_straight_512x128.png</menu-item-image>
-      <screenshoot>pictures/menu/ss_straight_512x512.png</screenshoot>
     </SinglePlayerWorld>
+
     <SinglePlayerWorld>
       <identifier>2</identifier>
-      <name>World3</name>
       <nextid>3</nextid>
       <path>worlds/christmas.oxw</path>
-      <menu-entry>1</menu-entry>
-      <menu-item-image>pictures/menu/se_christmas_512x128.png</menu-item-image>
-      <screenshoot>pictures/menu/ss_christmas_512x512.png</screenshoot>
     </SinglePlayerWorld>
+
     <SinglePlayerWorld>
       <identifier>3</identifier>
-      <name>World4</name>
       <nextid>4</nextid>
       <path>worlds/DefaultWorld.oxw</path>
-      <menu-entry>1</menu-entry>
-      <menu-item-image>pictures/menu/se_default_512x128.png</menu-item-image>
-      <screenshoot>pictures/menu/ss_default_512x512.png</screenshoot>
     </SinglePlayerWorld>
+
     <SinglePlayerWorld>
       <identifier>4</identifier>
-      <name>World5</name>
       <nextid>5</nextid>
       <path>worlds/vulcania.oxw</path>
-      <menu-entry>1</menu-entry>
-      <menu-item-image>pictures/menu/se_vulcano_512x128.png</menu-item-image>
-      <screenshoot>pictures/menu/ss_vulcano_512x512.png</screenshoot>
     </SinglePlayerWorld>
+
     <SinglePlayerWorld>
       <identifier>5</identifier>
-      <name>World6</name>
       <nextid>999</nextid>
       <path>worlds/World2.oxw</path>
-      <menu-entry>1</menu-entry>
-      <menu-item-image>pictures/menu/se_default_512x128.png</menu-item-image>
-      <screenshoot>pictures/menu/ss_default_512x512.png</screenshoot>
     </SinglePlayerWorld>
+
   </WorldList>
 </Campaign>

data/trunk/worlds/DefaultWorld.oxw

@@ -1 +1 @@
 <WorldDataFile>
   <name>NULLWORLD</name>
+  <menu-entry>1</menu-entry>
+  <menu-item-image>pictures/menu/se_default_512x128.png</menu-item-image>
+  <screenshoot>pictures/menu/ss_default_512x512.png</screenshoot>
+
   <LoadScreen>
     <BackgroundImage>pictures/load_screen.jpg</BackgroundImage>

data/trunk/worlds/Straight.oxw

@@ -1 +1 @@
 <WorldDataFile>
   <name>Straight</name>
+  <menu-entry>1</menu-entry>
+  <menu-item-image>pictures/menu/se_straight_512x128.png</menu-item-image>
+  <screenshoot>pictures/menu/ss_straight_512x512.png</screenshoot>
+
   <LoadScreen>
     <BackgroundImage>pictures/load_screen.jpg</BackgroundImage>

data/trunk/worlds/World2.oxw

@@ -1 +1 @@
 <WorldDataFile>
-  <name>NULLWORLD</name>
+  <name>Darkness</name>
+  <menu-entry>1</menu-entry>
+  <menu-item-image>pictures/menu/se_default_512x128.png</menu-item-image>
+  <screenshoot>pictures/menu/ss_default_512x512.png</screenshoot>
+
   <LoadScreen>
     <BackgroundImage>pictures/sky/skybox_right.jpg</BackgroundImage>

data/trunk/worlds/christmas.oxw

@@ -1 +1 @@
 <WorldDataFile>
-  <name>Straight</name>
+  <name>Christmas</name>
+  <menu-entry>1</menu-entry>
+  <menu-item-image>pictures/menu/se_christmas_512x128.png</menu-item-image>
+  <screenshoot>pictures/menu/ss_christmas_512x512.png</screenshoot>
+
   <LoadScreen>
     <BackgroundImage>pictures/load_screen_christmas.png</BackgroundImage>

data/trunk/worlds/vulcania.oxw

@@ -1 +1 @@
 <WorldDataFile>
-  <name>NULLWORLD</name>
+  <name>Vulcania</name>
+  <menu-entry>1</menu-entry>
+  <menu-item-image>pictures/menu/se_vulcano_512x128.png</menu-item-image>
+  <screenshoot>pictures/menu/ss_vulcano_512x512.png</screenshoot>
+
   <LoadScreen>
     <BackgroundImage>pictures/load_screen.jpg</BackgroundImage>