projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#303: Typo fixes from mathnerd314
[supertux.git]
/
src
/
object
/
electrifier.hpp
diff --git
a/src/object/electrifier.hpp
b/src/object/electrifier.hpp
index
3cfa1b8
..
3ad746c
100644
(file)
--- a/
src/object/electrifier.hpp
+++ b/
src/object/electrifier.hpp
@@
-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,19
+12,18
@@
// 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.
#ifndef __ELECTRIFIER_H__
#define __ELECTRIFIER_H__
#ifndef __ELECTRIFIER_H__
#define __ELECTRIFIER_H__
-#include <config.h>
#include "resources.hpp"
#include "game_object.hpp"
#include "timer.hpp"
#include "resources.hpp"
#include "game_object.hpp"
#include "timer.hpp"
+#include <stdint.h>
//Changes all tiles with the given ID to a new one for a given amount of time, then removes itself
//Used by the Kugelblitz to electrify water - can be used for other effects, too
//Changes all tiles with the given ID to a new one for a given amount of time, then removes itself
//Used by the Kugelblitz to electrify water - can be used for other effects, too
@@
-30,7
+32,7
@@
class Electrifier : public GameObject
public:
Electrifier(uint32_t oldtile, uint32_t newtile, float seconds);
~Electrifier();
public:
Electrifier(uint32_t oldtile, uint32_t newtile, float seconds);
~Electrifier();
-protected:
+protected:
virtual void update(float time);
virtual void draw(DrawingContext& context);
private:
virtual void update(float time);
virtual void draw(DrawingContext& context);
private:
@@
-40,4
+42,3
@@
private:
};
#endif
};
#endif
-