projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make it build with -DCOMPILE_AMALGATION=ON. Still not certain how intern_draw/next_po...
[supertux.git]
/
src
/
badguy
/
yeti_stalactite.cpp
diff --git
a/src/badguy/yeti_stalactite.cpp
b/src/badguy/yeti_stalactite.cpp
index
e3edc25
..
59d819b
100644
(file)
--- a/
src/badguy/yeti_stalactite.cpp
+++ b/
src/badguy/yeti_stalactite.cpp
@@
-1,12
+1,10
@@
-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// 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
-//
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
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,14
+12,15
@@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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 "badguy/yeti_stalactite.hpp"
-#include "
yeti_stalactite
.hpp"
+#include "
supertux/object_factory
.hpp"
-static const float SHAKE_TIME = .8f;
+static const float
YT_
SHAKE_TIME = .8f;
-YetiStalactite::YetiStalactite(const
lisp::Lisp
& lisp)
+YetiStalactite::YetiStalactite(const
Reader
& lisp)
: Stalactite(lisp)
{
}
: Stalactite(lisp)
{
}
@@
-31,18
+30,9
@@
YetiStalactite::~YetiStalactite()
}
void
}
void
-YetiStalactite::write(lisp::Writer& writer)
-{
- writer.start_list("yeti_stalactite");
- writer.write("x", start_position.x);
- writer.write("y", start_position.y);
- writer.end_list("yeti_stalactite");
-}
-
-void
YetiStalactite::start_shaking()
{
YetiStalactite::start_shaking()
{
- timer.start(SHAKE_TIME);
+ timer.start(
YT_
SHAKE_TIME);
state = STALACTITE_SHAKING;
}
state = STALACTITE_SHAKING;
}
@@
-61,4
+51,4
@@
YetiStalactite::active_update(float elapsed_time)
Stalactite::active_update(elapsed_time);
}
Stalactite::active_update(elapsed_time);
}
-IMPLEMENT_FACTORY(YetiStalactite, "yeti_stalactite")
+/* EOF */