From ed161bf9da56b598f3db3637c6017fa22e9ab0d7 Mon Sep 17 00:00:00 2001 From: Wolfgang Becker Date: Sat, 26 May 2007 17:30:03 +0000 Subject: [PATCH] play sound when willowisp is caught SVN-Revision: 5032 --- src/main.cpp | 2 ++ src/object/lantern.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 38180b544..2f624f93a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -435,6 +435,8 @@ void init_video() SCREEN_HEIGHT = static_cast (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 605983e22..531ad9599 100644 --- 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(&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(&other); if (twow) { // collided with TreeWillOWisp while grabbed and unlit + sound_manager->play("sounds/willocatch.wav"); lightcolor = twow->get_color(); updateColor(); twow->vanish(); -- 2.11.0