X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Flantern.cpp;h=db909a9bed3c900ec3dc444877820f1d86d1d205;hb=d097f456b8ab4f42058545bdd4f8f676d151e974;hp=a91b15ffc28f0e8a125e6bc99732b30081083bd5;hpb=9f9a92cd9d8433c6d4d63b0178fd038a95b9e1a1;p=supertux.git

diff --git a/src/object/lantern.cpp b/src/object/lantern.cpp
index a91b15ffc..db909a9be 100644
--- a/src/object/lantern.cpp
+++ b/src/object/lantern.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Lantern
 //  Copyright (C) 2006 Wolfgang Becker <uafr@gmx.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,33 +12,45 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#include "object/lantern.hpp"
 
-#include "lantern.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "object_factory.hpp"
-#include "badguy/willowisp.hpp"
+#include "audio/sound_manager.hpp"
 #include "badguy/treewillowisp.hpp"
+#include "badguy/willowisp.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "supertux/object_factory.hpp"
+#include "util/reader.hpp"
 
-Lantern::Lantern(const lisp::Lisp& reader)
-  : Rock(reader, "images/objects/lantern/lantern.sprite"),
-    lightcolor(1.0f, 1.0f, 1.0f)
+Lantern::Lantern(const Reader& reader) :
+  Rock(reader, "images/objects/lantern/lantern.sprite"),
+  lightcolor(1.0f, 1.0f, 1.0f),
+  lightsprite()
 {
   //get color from lisp
   std::vector<float> vColor;
-  reader.get_vector("color", vColor);
+  reader.get("color", vColor);
   lightcolor = Color(vColor);
-  lightsprite = sprite_manager->create("images/objects/lightmap_light/lightmap_light.sprite");
+  lightsprite = SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light.sprite");
+  lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+  updateColor();
+  SoundManager::current()->preload("sounds/willocatch.wav");
+}
+
+Lantern::Lantern(const Vector& pos) :
+  Rock(pos, "images/objects/lantern/lantern.sprite"),
+  lightcolor(0.0f, 0.0f, 0.0f),
+  lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light.sprite"))
+{
   lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
   updateColor();
+  SoundManager::current()->preload("sounds/willocatch.wav");
 }
 
 Lantern::~Lantern()
 {
-  delete lightsprite;
 }
 
 void
@@ -48,10 +58,10 @@ Lantern::updateColor(){
   lightsprite->set_color(lightcolor);
   //Turn lantern off if light is black
   if(lightcolor.red == 0 && lightcolor.green == 0 && lightcolor.blue == 0){
-     sprite->set_action("off");
+    sprite->set_action("off");
   } else {
-     sprite->set_action("normal");
-     sprite->set_color(lightcolor);
+    sprite->set_action("normal");
+    sprite->set_color(lightcolor);
   }
 }
 
@@ -69,10 +79,11 @@ Lantern::draw(DrawingContext& context){
 }
 
 HitResponse Lantern::collision(GameObject& other, const CollisionHit& hit) {
-  if ((grabbed) && lightcolor.red == 0 && lightcolor.green == 0 && lightcolor.blue == 0){
+  if (is_open()) {
     WillOWisp* wow = dynamic_cast<WillOWisp*>(&other);
     if (wow) {
       // collided with WillOWisp while grabbed and unlit
+      SoundManager::current()->play("sounds/willocatch.wav");
       lightcolor = Color(0,1,0);
       updateColor();
       wow->vanish();
@@ -80,6 +91,7 @@ HitResponse Lantern::collision(GameObject& other, const CollisionHit& hit) {
     TreeWillOWisp* twow = dynamic_cast<TreeWillOWisp*>(&other);
     if (twow) {
       // collided with TreeWillOWisp while grabbed and unlit
+      SoundManager::current()->play("sounds/willocatch.wav");
       lightcolor = twow->get_color();
       updateColor();
       twow->vanish();
@@ -94,7 +106,7 @@ Lantern::grab(MovingObject& object, const Vector& pos, Direction dir)
   Rock::grab(object, pos, dir);
 
   // if lantern is not lit, draw it as opened
-  if(lightcolor.red == 0 && lightcolor.green == 0 && lightcolor.blue == 0){
+  if (is_open()) {
     sprite->set_action("off-open");
   }
 
@@ -103,13 +115,18 @@ Lantern::grab(MovingObject& object, const Vector& pos, Direction dir)
 void
 Lantern::ungrab(MovingObject& object, Direction dir)
 {
-  Rock::ungrab(object, dir);
-
   // if lantern is not lit, it was drawn as opened while grabbed. Now draw it as closed again
-  if(lightcolor.red == 0 && lightcolor.green == 0 && lightcolor.blue == 0){
+  if (is_open()) {
     sprite->set_action("off");
   }
+
+  Rock::ungrab(object, dir);
 }
 
-IMPLEMENT_FACTORY(Lantern, "lantern");
+bool
+Lantern::is_open()
+{
+  return ((grabbed) && lightcolor.red == 0 && lightcolor.green == 0 && lightcolor.blue == 0);
+}
 
+/* EOF */