projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- added color ligts
[supertux.git]
/
src
/
object
/
rock.cpp
diff --git
a/src/object/rock.cpp
b/src/object/rock.cpp
index
b6ad844
..
6ba11fc
100644
(file)
--- a/
src/object/rock.cpp
+++ b/
src/object/rock.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,34
+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 "rock.hpp"
#include <config.h>
#include "rock.hpp"
-#include "sprite/sprite.hpp"
-#include "sprite/sprite_manager.hpp"
#include "lisp/writer.hpp"
#include "video/drawing_context.hpp"
#include "resources.hpp"
#include "object_factory.hpp"
Rock::Rock(const lisp::Lisp& reader)
#include "lisp/writer.hpp"
#include "video/drawing_context.hpp"
#include "resources.hpp"
#include "object_factory.hpp"
Rock::Rock(const lisp::Lisp& reader)
+ : MovingSprite(reader, "images/objects/rock/rock.sprite", LAYER_OBJECTS+1, COLGROUP_MOVING)
{
{
- reader.get("x", bbox.p1.x);
- reader.get("y", bbox.p1.y);
- bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("rock");
grabbed = false;
grabbed = false;
- flags |= FLAG_SOLID;
-}
-
-Rock::~Rock()
-{
- delete sprite;
+ flags |= FLAG_SOLID | FLAG_PORTABLE;
}
void
}
void
@@
-54,12
+44,6
@@
Rock::write(lisp::Writer& writer)
}
void
}
void
-Rock::draw(DrawingContext& context)
-{
- sprite->draw(context, get_pos(), LAYER_OBJECTS);
-}
-
-void
Rock::update(float elapsed_time)
{
if(!grabbed) {
Rock::update(float elapsed_time)
{
if(!grabbed) {
@@
-73,6
+57,11
@@
Rock::update(float elapsed_time)
}
grabbed = false;
}
grabbed = false;
+ /*
+ printf("%p - V %3.1f %3.1f - P %3.1f %3.1f\n", this,
+ physic.get_velocity().x, physic.get_velocity().y,
+ get_pos().x, get_pos().y);
+ */
}
HitResponse
}
HitResponse