Permalink
Browse files

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

  • Loading branch information...
2 parents 4e10bd6 + a483a6d commit 53d752a79a6e68119a354f1786cdfad4d87c0442 @jwoertink committed Jul 18, 2012
Showing with 12 additions and 2 deletions.
  1. +10 −0 Gemfile.lock
  2. BIN assets/game-song.ogg
  3. BIN assets/title-screen.ogg
  4. +1 −1 title_screen.rb
  5. +1 −1 window.rb
View
@@ -0,0 +1,10 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ gosu (0.7.41-x86-mingw32)
+
+PLATFORMS
+ x86-mingw32
+
+DEPENDENCIES
+ gosu (= 0.7.41)
View
Binary file not shown.
View
Binary file not shown.
View
@@ -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
View
@@ -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

0 comments on commit 53d752a

Please sign in to comment.