projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issue with action not being updated when typing grow()/fire()/etc in console...
[supertux.git]
/
src
/
object
/
rainsplash.cpp
diff --git
a/src/object/rainsplash.cpp
b/src/object/rainsplash.cpp
index
2bd2cc9
..
c69f817
100644
(file)
--- a/
src/object/rainsplash.cpp
+++ b/
src/object/rainsplash.cpp
@@
-1,4
+1,7
@@
+// $Id$
+//
// SuperTux
// SuperTux
+// Copyright (C) 2006 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
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-9,11
+12,12
@@
// 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.
// 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
// 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 <config.h>
+
#include "rainsplash.hpp"
#include "sector.hpp"
#include "rainsplash.hpp"
#include "sector.hpp"
@@
-21,10
+25,10
@@
RainSplash::RainSplash(Vector pos, bool vertical)
{
frame = 0;
position = pos;
{
frame = 0;
position = pos;
- if (vertical) sprite = sprite_manager->create("
rainsplash-vertical
");
- else sprite = sprite_manager->create("
rainsplash
");
+ if (vertical) sprite = sprite_manager->create("
images/objects/particles/rainsplash-vertical.sprite
");
+ else sprite = sprite_manager->create("
images/objects/particles/rainsplash.sprite
");
}
}
-
+
RainSplash::~RainSplash() {
remove_me();
}
RainSplash::~RainSplash() {
remove_me();
}
@@
-35,7
+39,7
@@
RainSplash::hit(Player& )
}
void
}
void
-RainSplash::update(float time)
+RainSplash::update(float time)
{
time = 0;//just so i don't get an "unused variable" error - don't know how to circumvent this
frame++;
{
time = 0;//just so i don't get an "unused variable" error - don't know how to circumvent this
frame++;
@@
-43,7
+47,7
@@
RainSplash::update(float time)
}
void
}
void
-RainSplash::draw(DrawingContext& context)
+RainSplash::draw(DrawingContext& context)
{
sprite->draw(context, position, LAYER_OBJECTS);
}
{
sprite->draw(context, position, LAYER_OBJECTS);
}