Merge branch 'master' of github.com:jwoertink/pcotm

jwoertink · Jul 18, 2012 · 53d752a · 53d752a
2 parents 4e10bd6 + a483a6d
commit 53d752a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,10 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    gosu (0.7.41-x86-mingw32)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  gosu (= 0.7.41)
diff --git a/assets/game-song.ogg b/assets/game-song.ogg
diff --git a/assets/title-screen.ogg b/assets/title-screen.ogg
diff --git a/title_screen.rb b/title_screen.rb
@@ -6,7 +6,7 @@ def initialize(window)
     @background = Gosu::Image.new(window, File.join(File.dirname(__FILE__), 'assets', 'title-screen.png'), true)
     set_text!
     @selector = OptionSelector.new(window, 160, 280, 3)
-    @title_song = Gosu::Song.new(window, File.join(File.dirname(__FILE__), 'assets', 'title-screen.mp3'))
+    @title_song = Gosu::Song.new(window, File.join(File.dirname(__FILE__), 'assets', 'title-screen.ogg'))
     @title_song.play(true)
   end
 

diff --git a/window.rb b/window.rb
@@ -12,7 +12,7 @@ def initialize
     @score_font = Gosu::Font.new(self, Gosu.default_font_name, 26)
     @game_in_progress = false
     @title_screen = TitleScreen.new(self)
-    @game_song = Gosu::Song.new(self, File.join(File.dirname(__FILE__), 'assets', 'game-song.mp3'))
+    @game_song = Gosu::Song.new(self, File.join(File.dirname(__FILE__), 'assets', 'game-song.ogg'))
   end
 
   def update