X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsnowball.cpp;h=1c2e6b67843413eb8c06fe493f16fafc023ab62f;hb=4c9b57d29e67f9db5605f378549b07f670baa837;hp=e7f049dc687594f92596885d9cf78ddca19cfa56;hpb=3dd252d40f9d0e213c8ddbad989cd24cf5f0a9b5;p=supertux.git diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp index e7f049dc6..1c2e6b678 100644 --- a/src/badguy/snowball.cpp +++ b/src/badguy/snowball.cpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,11 +12,10 @@ // 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. +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include @@ -29,11 +28,11 @@ SnowBall::SnowBall(const lisp::Lisp& reader) reader.get("x", start_position.x); reader.get("y", start_position.y); //This is for a hidden badguy :) - bool fluffy = false; + fluffy = false; reader.get("fluffy",fluffy); bbox.set_size(31.8, 31.8); - if (fluffy) sprite = sprite_manager->create("fluffy"); - else sprite = sprite_manager->create("snowball"); + if (fluffy) sprite = sprite_manager->create("images/creatures/fluffy/fluffy.sprite"); + else sprite = sprite_manager->create("images/creatures/snowball/snowball.sprite"); set_direction = false; } @@ -42,7 +41,7 @@ SnowBall::SnowBall(float pos_x, float pos_y, Direction d) start_position.x = pos_x; start_position.y = pos_y; bbox.set_size(31.8, 31.8); - sprite = sprite_manager->create("snowball"); + sprite = sprite_manager->create("images/creatures/snowball/snowball.sprite"); set_direction = true; initial_direction = d; } @@ -55,6 +54,10 @@ SnowBall::write(lisp::Writer& writer) writer.write_float("x", start_position.x); writer.write_float("y", start_position.y); + if (fluffy) { // don't give us away at every snowball + writer.write_bool("fluffy", true); + } + writer.end_list("snowball"); }