projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched from tinygettext/tags/tinygetext-supertux/ to tinygettext/trunk/
[supertux.git]
/
src
/
object
/
rock.cpp
diff --git
a/src/object/rock.cpp
b/src/object/rock.cpp
index
472e396
..
3daf712
100644
(file)
--- a/
src/object/rock.cpp
+++ b/
src/object/rock.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,23
+12,23
@@
// 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.
-
-#include <config.h>
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "rock.hpp"
-#include "lisp/writer.hpp"
-#include "object_factory.hpp"
#include "audio/sound_manager.hpp"
#include "audio/sound_manager.hpp"
-#include "tile.hpp"
+#include "object/rock.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/tile.hpp"
namespace {
namespace {
-
const std::string ROCK_SOUND = "sounds/brick.wav"; //TODO use own sound.
+const std::string ROCK_SOUND = "sounds/brick.wav"; //TODO use own sound.
}
}
-Rock::Rock(const lisp::Lisp& reader)
- : MovingSprite(reader, "images/objects/rock/rock.sprite")
+Rock::Rock(const Vector& pos, std::string spritename) :
+ MovingSprite(pos, spritename),
+ physic(),
+ on_ground(),
+ grabbed(),
+ last_movement()
{
sound_manager->preload(ROCK_SOUND);
on_ground = false;
{
sound_manager->preload(ROCK_SOUND);
on_ground = false;
@@
-38,8
+36,12
@@
Rock::Rock(const lisp::Lisp& reader)
set_group(COLGROUP_MOVING_STATIC);
}
set_group(COLGROUP_MOVING_STATIC);
}
-Rock::Rock(const lisp::Lisp& reader, std::string spritename)
- : MovingSprite(reader, spritename)
+Rock::Rock(const Reader& reader) :
+ MovingSprite(reader, "images/objects/rock/rock.sprite"),
+ physic(),
+ on_ground(),
+ grabbed(),
+ last_movement()
{
sound_manager->preload(ROCK_SOUND);
on_ground = false;
{
sound_manager->preload(ROCK_SOUND);
on_ground = false;
@@
-47,15
+49,17
@@
Rock::Rock(const lisp::Lisp& reader, std::string spritename)
set_group(COLGROUP_MOVING_STATIC);
}
set_group(COLGROUP_MOVING_STATIC);
}
-void
-Rock::write(lisp::Writer& writer)
+Rock::Rock(const Reader& reader, std::string spritename) :
+ MovingSprite(reader, spritename),
+ physic(),
+ on_ground(),
+ grabbed(),
+ last_movement()
{
{
- writer.start_list("rock");
-
- writer.write_float("x", bbox.p1.x);
- writer.write_float("y", bbox.p1.y);
-
- writer.end_list("rock");
+ sound_manager->preload(ROCK_SOUND);
+ on_ground = false;
+ grabbed = false;
+ set_group(COLGROUP_MOVING_STATIC);
}
void
}
void
@@
-64,12
+68,17
@@
Rock::update(float elapsed_time)
if( grabbed )
return;
if( grabbed )
return;
+ if (on_ground) physic.set_velocity_x(0);
+
movement = physic.get_movement(elapsed_time);
}
void
Rock::collision_solid(const CollisionHit& hit)
{
movement = physic.get_movement(elapsed_time);
}
void
Rock::collision_solid(const CollisionHit& hit)
{
+ if(grabbed) {
+ return;
+ }
if(hit.top || hit.bottom)
physic.set_velocity_y(0);
if(hit.left || hit.right)
if(hit.top || hit.bottom)
physic.set_velocity_y(0);
if(hit.left || hit.right)
@@
-77,7
+86,7
@@
Rock::collision_solid(const CollisionHit& hit)
if(hit.crush)
physic.set_velocity(0, 0);
if(hit.crush)
physic.set_velocity(0, 0);
- if(hit.bottom && !on_ground) {
+ if(hit.bottom && !on_ground
&& !grabbed
) {
sound_manager->play(ROCK_SOUND, get_pos());
on_ground = true;
}
sound_manager->play(ROCK_SOUND, get_pos());
on_ground = true;
}
@@
-86,6
+95,9
@@
Rock::collision_solid(const CollisionHit& hit)
HitResponse
Rock::collision(GameObject& other, const CollisionHit& hit)
{
HitResponse
Rock::collision(GameObject& other, const CollisionHit& hit)
{
+ if(grabbed) {
+ return PASSTHROUGH;
+ }
if(!on_ground) {
if(hit.bottom && physic.get_velocity_y() > 200) {
MovingObject* moving_object = dynamic_cast<MovingObject*> (&other);
if(!on_ground) {
if(hit.bottom && physic.get_velocity_y() > 200) {
MovingObject* moving_object = dynamic_cast<MovingObject*> (&other);
@@
-104,18
+116,27
@@
void
Rock::grab(MovingObject& , const Vector& pos, Direction)
{
movement = pos - get_pos();
Rock::grab(MovingObject& , const Vector& pos, Direction)
{
movement = pos - get_pos();
- set_group(COLGROUP_DISABLED);
- on_ground = true;
+ last_movement = movement;
+ set_group(COLGROUP_TOUCHABLE);
+ on_ground = false;
grabbed = true;
}
void
grabbed = true;
}
void
-Rock::ungrab(MovingObject& , Direction )
+Rock::ungrab(MovingObject& , Direction
dir
)
{
set_group(COLGROUP_MOVING_STATIC);
on_ground = false;
{
set_group(COLGROUP_MOVING_STATIC);
on_ground = false;
- physic.set_velocity(0, 0);
+ if(dir == UP) {
+ physic.set_velocity(0, -500);
+ } else if (last_movement.norm() > 1) {
+ physic.set_velocity((dir == RIGHT) ? 200 : -200, -200);
+ } else {
+ physic.set_velocity(0, 0);
+ }
grabbed = false;
}
IMPLEMENT_FACTORY(Rock, "rock");
grabbed = false;
}
IMPLEMENT_FACTORY(Rock, "rock");
+
+/* EOF */