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
/
skull_tile.cpp
diff --git
a/src/object/skull_tile.cpp
b/src/object/skull_tile.cpp
index
4afb207
..
ef2ead9
100644
(file)
--- a/
src/object/skull_tile.cpp
+++ b/
src/object/skull_tile.cpp
@@
-1,7
+1,7
@@
-// $Id
: unstable_tile.cpp 2642 2005-06-26 13:38:53Z matzebraun
$
-//
+// $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,11
+12,10
@@
// 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 <config.h>
@@
-26,33
+25,20
@@
#include "player.hpp"
#include "sector.hpp"
#include "resources.hpp"
#include "player.hpp"
#include "sector.hpp"
#include "resources.hpp"
-#include "sprite/sprite_manager.hpp"
#include "sprite/sprite.hpp"
#include "sprite/sprite.hpp"
+#include "random_generator.hpp"
-static const float CRACKTIME = 0.3;
-static const float FALLTIME = 0.8;
+static const float CRACKTIME = 0.3
f
;
+static const float FALLTIME = 0.8
f
;
SkullTile::SkullTile(const lisp::Lisp& lisp)
SkullTile::SkullTile(const lisp::Lisp& lisp)
-
:
hit(false), falling(false)
+
: MovingSprite(lisp, "images/objects/skull_tile/skull_tile.sprite", LAYER_TILES, COLGROUP_STATIC),
hit(false), falling(false)
{
{
- lisp.get("x", bbox.p1.x);
- lisp.get("y", bbox.p1.y);
- bbox.set_size(32, 32);
- sprite = sprite_manager->create("skull_tile");
- flags |= FLAG_SOLID;
-}
-
-SkullTile::~SkullTile()
-{
- delete sprite;
}
HitResponse
}
HitResponse
-SkullTile::collision(GameObject& other, const CollisionHit&
hitdata
)
+SkullTile::collision(GameObject& other, const CollisionHit& )
{
{
- if(hitdata.normal.y < 0.8)
- return FORCE_MOVE;
-
Player* player = dynamic_cast<Player*> (&other);
if(player)
hit = true;
Player* player = dynamic_cast<Player*> (&other);
if(player)
hit = true;
@@
-64,12
+50,12
@@
void
SkullTile::draw(DrawingContext& context)
{
Vector pos = get_pos();
SkullTile::draw(DrawingContext& context)
{
Vector pos = get_pos();
- // sha
c
king
+ // shaking
if(timer.get_timegone() > CRACKTIME) {
if(timer.get_timegone() > CRACKTIME) {
- pos.x +=
(rand() % 6) - 3
;
- }
+ pos.x +=
systemRandom.rand(-3, 3)
;
+ }
- sprite->draw(context, pos,
LAYER_TILES
);
+ sprite->draw(context, pos,
layer
);
}
void
}
void
@@
-84,8
+70,7
@@
SkullTile::update(float elapsed_time)
} else if(hit) {
if(timer.check()) {
falling = true;
} else if(hit) {
if(timer.check()) {
falling = true;
- physic.enable_gravity(true);
- flags &= ~FLAG_SOLID;
+ physic.enable_gravity(true);
timer.stop();
} else if(!timer.started()) {
timer.start(FALLTIME);
timer.stop();
} else if(!timer.started()) {
timer.start(FALLTIME);