Changeset 4529

Timestamp:

2013-07-22 15:01:25 (6 years ago)

Author:

jumakall

Message:

 

Location:

2013/27/TeemuM/Game/Game/Game

Files:

• AudioPlayer.cs (modified) (2 diffs)
• Game.cs (modified) (5 diffs)

2013/27/TeemuM/Game/Game/Game/AudioPlayer.cs

@@ -1 +1 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using Jypeli;
@@ -11 +12 @@
 {
     private G game;
-    private int lastStartIndex = -1;
+    private string currentType;
 
-    private Timer tick = new Timer();
+    Timer tick;
+    Hashtable lengths = new Hashtable();
 
-    private List<String> types = new List<String>();
-    private List<int> max = new List<int>();
-
-    public AudioPlayer(G game, int cInterval)
+    public AudioPlayer(G game, int updateInterval)
     {
-        this.game = game;
-        tick.Interval = cInterval;
+        Timer tick = new Timer();
+        tick.Interval = updateInterval;
+        tick.Timeout += delegate() { UpdateAudio(); };
     }
 
-    public bool RegisterType(String type, int maxValue)
+    #region Length register managment
+
+    public bool Register(string type, int length)
     {
-        if (maxValue < 0 || type == "")
+        if (lengths.ContainsKey(type))
             return false;
 
-        types.Add(type);
-        max.Add(maxValue);
-
+        lengths[type] = length;
         return true;
     }
 
-    public bool Play(String type, bool force)
+    public bool IsRegistered(string type)
     {
-        for (int i = 0; i < types.Count; i++)
-            if (types[i].ToLower() == type.ToLower())
-            {
-                if (force)
-                    game.MediaPlayer.Stop();
-
-                tick.Timeout += delegate() { Player(types[i], max[i]); };
-                tick.Start();
-                Player(types[i], max[i]);
-                return true;
-            }
-
-        return false;
+        if (lengths.ContainsKey(type))
+            return true;
+        else
+            return false;
     }
 
-    public bool PlayEffect(String type)
+    public void Unregister(string type)
     {
-        for (int i = 0; i < types.Count; i++)
-            if (types[i].ToLower() == type.ToLower())
-            {
-                Game.LoadSoundEffect(type + RandomGen.NextInt(0, max[i])).Play();
-                return true;
-            }
+        if (lengths.ContainsKey(type))
+            lengths.Remove(type);
+    }
 
-        return false;
+    #endregion
+
+    #region Controls
+
+    public bool Play(string type)
+    {
+        if (!lengths.ContainsKey(type))
+            return false;
+
+        currentType = type;
+        tick.Start();
+        return true;
     }
 
     public void Stop()
     {
+        tick.Stop();
         game.MediaPlayer.Stop();
     }
 
-    public void PlayOne(String resource, bool stopAfterThis)
+    #endregion
+
+    private void UpdateAudio()
     {
-        if (stopAfterThis)
-            tick.Stop();
-
-        game.MediaPlayer.Stop();
-        game.MediaPlayer.Play(resource);
+        if (!game.MediaPlayer.IsPlaying)
+            game.MediaPlayer.Play(currentType + RandomGen.NextInt(0, (int)lengths[currentType]));
     }
 
-    public void SetCheckInterval(double interval)
+    public void Console(String command)
     {
-        tick.Interval = interval;
-    }
+        String[] commands = command.Split(' ');
+        
+        if (commands.Length < 1)
+            return;
 
-    private void Player(string type, int max)
-    {
-        if (!game.MediaPlayer.IsPlaying)
-        {
-            lastStartIndex = RandomGen.NextInt(0, max + 1);
-            game.MediaPlayer.Play(type + lastStartIndex);
-        }
-    }
-
-    #region Console
-
-    private void Print(String txt)
-    {
-        game.MessageDisplay.Add(txt);
-    }
-
-    public bool Console(String command)
-    {
-        if (command.Length < 0)
-            return false;
-
-        String[] commands = command.Split(' ');
         if (commands[0] == "play")
         {
             if (commands.Length < 2)
-                return false;
+                return;
 
-            bool force = true;
-            if (commands.Length > 2)
-                if (commands[2] == "!force")
-                    force = true;
-
-            if (Play(commands[1], force))
-                Print("Playing " + commands[1] + " #" + lastStartIndex);
-            else
-                Print("Type \"" + commands[1] + "\" is not registered");
+            Play(commands[1]);
         }
-        else if (commands[0] == "playone")
+        else if (commands[0] == "stop")
         {
-            if (commands.Length < 2)
-                return false;
-
-            bool stop = false;
-            if (commands.Length > 2)
-                if (commands[2] == "stop")
-                    stop = true;
-
-            PlayOne(commands[1], stop);
-            Print("Playing " + commands[1]);
+            Stop();
+            game.MessageDisplay.Add("Audio: Stopped");
         }
         else if (commands[0] == "register")
         {
-            if (commands.Length < 2)
-                return false;
+            if (commands.Length < 3)
+                return;
 
-            if (commands[1] == "list")
-            {
-                if (types.Count > 0)
-                {
-                    Print("Registered types: ");
-                    foreach (string type in types)
-                        Print(type);
-                }
-                else { Print("No registered types"); }
-            }
+            int length = 0;
+            int.TryParse(commands[2], out length);
+
+            if (Register(commands[1], length))
+                game.MessageDisplay.Add("Audio: " + commands[1] + " registered");
+            else
+                game.MessageDisplay.Add("Audio: " + commands[1] + " is already registered, please unregister first");
         }
-        else
+        else if (commands[0] == "effect")
         {
-            return false;
+
         }
-
-        return true;
     }
-
-    #endregion
 }

2013/27/TeemuM/Game/Game/Game/Game.cs

@@ -13 +13 @@
     {
         audio = new AudioPlayer(this, 3);
-
-        audio.RegisterType("Background", 4);
-        audio.RegisterType("Enemyspawn", 0);
-        audio.RegisterType("GameOverSound", 0);
-        audio.RegisterType("MenuMusic", 0);
-        audio.RegisterType("RandomSound", 0);
-        audio.RegisterType("ZombieBite", 0);
-        audio.RegisterType("Zombiesound", 2);
     }
 
@@ -46 +38 @@
         menu.AddItemHandler(2, Exit);
         Add(menu);
-        audio.Play("MenuMusic", true);
     }
 
@@ -75 +66 @@
             else if (commands[0] == "lol")
             {
-                audio.PlayOne("EasterEgg", false);
+
             }
             else if (commands[0] == "score")
@@ -202 +193 @@
         AddScoreMeter();
         CreateLifeMeter();
-
-        audio.Play("Background", true);
 
         Timer t = new Timer();
@@ -324 +313 @@
         ClearControls();
         Keyboard.Listen(Key.Enter, ButtonState.Pressed, delegate() { MainMenu(); }, null);
-        audio.Play("GameOverSound", true);
         GameObject layer = new GameObject(Game.Screen.Width + 100, Game.Screen.Height + 100);
         layer.Color = Color.Transparent;