Mercurial > hg > ristipolku

diff game/Engine.java @ 93:e1d657e6c25b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on audio code.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 03 Mar 2011 18:21:45 +0200
parents 753156d64493
children 75015dfd47ef
line wrap: on
line diff
--- a/game/Engine.java	Thu Mar 03 18:12:04 2011 +0200
+++ b/game/Engine.java	Thu Mar 03 18:21:45 2011 +0200
@@ -215,7 +215,7 @@
         super(pos);
         pscale = ps;
 
-//        sndPlaced = smgr.getSound("sounds/placed.wav");
+        sndPlaced = G.smgr.getSound("sounds/placed.wav");
 
         startNewGame();
     }
@@ -471,7 +471,7 @@
         System.out.print("Engine() constructor\n");
         
         // Sound system
-        G.smgr = new SoundManager(new AudioFormat(22050, 16, 1, true, false), 4);
+        G.smgr = new SoundManager(new AudioFormat(22050, 16, 1, true, false), 2);
 
         // Load resources
         try
@@ -528,14 +528,16 @@
         addMouseListener(this);
         addMouseWheelListener(this);
 
+        // Start playing background music
+        G.smgr.play(musa);
+
         // Get initial focus
         if (!hasFocus())
         {
             System.out.print("Engine(): requesting focus\n");
             requestFocus();
         }
-        
-//        G.smgr.play(musa);
+
     }
 
     public void startNewGame()