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
/
specialriser.cpp
diff --git
a/src/object/specialriser.cpp
b/src/object/specialriser.cpp
index
24ab26f
..
60c7861
100644
(file)
--- a/
src/object/specialriser.cpp
+++ b/
src/object/specialriser.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,25
+12,24
@@
// 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 <math.h>
#include <config.h>
#include <math.h>
-#include "specialriser.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "app/globals.h"
-#include "sprite/sprite_manager.h"
+#include "specialriser.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "sprite/sprite_manager.hpp"
-SpecialRiser::SpecialRiser(MovingObject* _child)
+SpecialRiser::SpecialRiser(
Vector pos,
MovingObject* _child)
: child(_child)
{
: child(_child)
{
+ _child->set_pos(pos - Vector(0, 32));
offset = 0;
}
offset = 0;
}
@@
-39,7
+38,7
@@
SpecialRiser::~SpecialRiser()
}
void
}
void
-SpecialRiser::
action
(float elapsed_time)
+SpecialRiser::
update
(float elapsed_time)
{
offset += 50 * elapsed_time;
if(offset > 32) {
{
offset += 50 * elapsed_time;
if(offset > 32) {
@@
-57,4
+56,3
@@
SpecialRiser::draw(DrawingContext& context)
child->draw(context);
context.pop_transform();
}
child->draw(context);
context.pop_transform();
}
-