Changeset 3791 for 2012/30

Timestamp:

2012-07-27 11:55:53 (11 years ago)

Author:

anlakane

Message:

Talletus.

Location:

2012/30/JyriP/X/X

Files:

• X/X.cs (modified) (4 diffs)
• XContent/XContent.contentproj (modified) (1 diff)
• XContent/maps/map3.png (modified) (previous)
• XContent/maps/map4.png (added)

2012/30/JyriP/X/X/X/X.cs

@@ -47 +47 @@
     void MapMenu()
     {
-        MultiSelectWindow MapList = new MultiSelectWindow("X Maps", "Hello World", "Run!", "QWE");
+        MultiSelectWindow MapList = new MultiSelectWindow("X Maps", "Hello World", "Run!", "QWE", ".:???:.");
         MapList.AddItemHandler(0, NextMap);
         MapList.AddItemHandler(1, map2);
         MapList.AddItemHandler(2, map3);
+        MapList.AddItemHandler(3, map4);
         Add(MapList);
     }
@@ -56 +57 @@
     void map2()
     {
+        MediaPlayer.Play("musics/music2");
         mapNum = 2;
         NextMap();
@@ -62 +64 @@
     void map3()
     {
-        MediaPlayer.Stop();
+        MediaPlayer.Play("musics/theme");
         mapNum = 3;
+        NextMap();
+    }
+
+    void map4()
+    {
+        MediaPlayer.Play("musics/music2");
+        mapNum = 4;
         NextMap();
     }
@@ -77 +86 @@
         {
             CreateMap("maps/map2");
-            MediaPlayer.Play("musics/music2");
         }
         else if (mapNum == 3)
         {
-            MediaPlayer.Play("musics/theme");
             CreateMap("maps/map3");
         }
-        else if (mapNum == 4) MainMenu();
+        else if (mapNum == 4)
+        {
+            CreateMap("maps/map4");
+        }
 
         Level.Background.FitToLevel();

2012/30/JyriP/X/X/XContent/XContent.contentproj

@@ -230 +230 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="maps\map4.png">
+      <Name>map4</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.