play sound when willowisp is caught

SVN-Revision: 5032

diff --git a/src/main.cpp b/src/main.cpp
index 38180b5..2f624f9 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -435,6 +435,8 @@ void init_video()
        SCREEN_HEIGHT = static_cast<int> (600 * 1/aspect_ratio);
   }
 
+  log_info << (config->use_fullscreen?"fullscreen ":"window ") << SCREEN_WIDTH << "x" << SCREEN_HEIGHT << "\n";
+
   // setup opengl state and transform
   glDisable(GL_DEPTH_TEST);
   glDisable(GL_CULL_FACE);

diff --git a/src/object/lantern.cpp b/src/object/lantern.cpp
index 605983e..531ad95 100644 (file)
--- a/src/object/lantern.cpp
+++ b/src/object/lantern.cpp
@@ -36,6 +36,7 @@ Lantern::Lantern(const lisp::Lisp& reader)
   lightsprite = sprite_manager->create("images/objects/lightmap_light/lightmap_light.sprite");
   lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
   updateColor();
+  sound_manager->preload("sounds/willocatch.wav");
 }
 
 Lantern::~Lantern()
@@ -73,6 +74,7 @@ HitResponse Lantern::collision(GameObject& other, const CollisionHit& hit) {
     WillOWisp* wow = dynamic_cast<WillOWisp*>(&other);
     if (wow) {
       // collided with WillOWisp while grabbed and unlit
+      sound_manager->play("sounds/willocatch.wav");
       lightcolor = Color(0,1,0);
       updateColor();
       wow->vanish();
@@ -80,6 +82,7 @@ HitResponse Lantern::collision(GameObject& other, const CollisionHit& hit) {
     TreeWillOWisp* twow = dynamic_cast<TreeWillOWisp*>(&other);
     if (twow) {
       // collided with TreeWillOWisp while grabbed and unlit
+      sound_manager->play("sounds/willocatch.wav");
       lightcolor = twow->get_color();
       updateColor();
       twow->vanish();