+// $Id$
+//
+// SuperTux
+// Copyright (C) 2005 Matthias Braun <matze@braunis.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 distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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.
#include <config.h>
-#include "dispenser.h"
-#include "badguy/bouncing_snowball.h"
-#include "badguy/snowball.h"
-#include "badguy/mrbomb.h"
-#include "badguy/mriceblock.h"
-#include "badguy/mrrocket.h"
-#include "badguy/poisonivy.h"
+#include "dispenser.hpp"
+#include "badguy/bouncing_snowball.hpp"
+#include "badguy/snowball.hpp"
+#include "badguy/mrbomb.hpp"
+#include "badguy/mriceblock.hpp"
+#include "badguy/mrrocket.hpp"
+#include "badguy/poisonivy.hpp"
+#include "badguy/snowsnail.hpp"
Dispenser::Dispenser(const lisp::Lisp& reader)
{
reader.get("cycle", cycle);
reader.get("badguy", badguy);
bbox.set_size(32, 32);
- sprite = sprite_manager->create("dispenser");
+ sprite = sprite_manager->create("images/creatures/dispenser/dispenser.sprite");
if (badguy == "mrrocket") {
sprite->set_action(dir == LEFT ? "working-left" : "working-right");
}
else {sprite->set_action("dropper");}
+ countMe = false;
}
void
}
void
-Dispenser::active_action(float )
+Dispenser::active_update(float )
{
if (dispense_timer.check()) {
launch_badguy();
Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir));
else if (badguy == "mriceblock")
Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir));
+ else if (badguy == "snowsnail")
+ Sector::current()->add_object(new SnowSnail(get_pos().x, get_pos().y+32, dir));
else if (badguy == "mrrocket") {
- int offset = (dir == LEFT ? -32 : 32);
- Sector::current()->add_object(new MrRocket(get_pos().x+offset, get_pos().y, dir));}
+ Sector::current()->add_object(new MrRocket(get_pos().x+(dir == LEFT ? -32 : 32), get_pos().y, dir));}
else if (badguy == "poisonivy")
Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir));
else if (badguy == "random")
{
- switch (rand()%5)
+ switch (rand()%6)
{
case 0: Sector::current()->add_object(new SnowBall(get_pos().x, get_pos().y+32, dir)); break;
case 1: Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y+32, dir)); break;
case 2: Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir)); break;
case 3: Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir)); break;
case 4: Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir)); break;
+ case 5: Sector::current()->add_object(new SnowSnail(get_pos().x, get_pos().y+32, dir)); break;
}
}
}