projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more aspect ratio stuff
[supertux.git]
/
src
/
badguy
/
yeti_stalactite.cpp
diff --git
a/src/badguy/yeti_stalactite.cpp
b/src/badguy/yeti_stalactite.cpp
index
d3f2b90
..
de27da3
100644
(file)
--- a/
src/badguy/yeti_stalactite.cpp
+++ b/
src/badguy/yeti_stalactite.cpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
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
@@
-12,15
+12,14
@@
// 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 "yeti_stalactite.h"
+#include "yeti_stalactite.h
pp
"
-static const float SHAKE_TIME = .8;
+static const float SHAKE_TIME = .8
f
;
YetiStalactite::YetiStalactite(const lisp::Lisp& lisp)
: Stalactite(lisp)
YetiStalactite::YetiStalactite(const lisp::Lisp& lisp)
: Stalactite(lisp)
@@
-32,6
+31,15
@@
YetiStalactite::~YetiStalactite()
}
void
}
void
+YetiStalactite::write(lisp::Writer& writer)
+{
+ writer.start_list("yeti_stalactite");
+ writer.write_float("x", start_position.x);
+ writer.write_float("y", start_position.y);
+ writer.end_list("yeti_stalactite");
+}
+
+void
YetiStalactite::start_shaking()
{
timer.start(SHAKE_TIME);
YetiStalactite::start_shaking()
{
timer.start(SHAKE_TIME);
@@
-45,12
+53,12
@@
YetiStalactite::is_hanging()
}
void
}
void
-YetiStalactite::active_
action
(float elapsed_time)
+YetiStalactite::active_
update
(float elapsed_time)
{
if(state == STALACTITE_HANGING)
return;
{
if(state == STALACTITE_HANGING)
return;
- Stalactite::active_
action
(elapsed_time);
+ Stalactite::active_
update
(elapsed_time);
}
IMPLEMENT_FACTORY(YetiStalactite, "yeti_stalactite")
}
IMPLEMENT_FACTORY(YetiStalactite, "yeti_stalactite")