projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- added quick&dirty peeking back (not exactly perfect, but better then no peeking)
[supertux.git]
/
src
/
object
/
invisible_block.hpp
diff --git
a/src/object/invisible_block.hpp
b/src/object/invisible_block.hpp
index
4a56956
..
85fbb4b
100644
(file)
--- a/
src/object/invisible_block.hpp
+++ b/
src/object/invisible_block.hpp
@@
-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,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.
#ifndef __INVISIBLE_BLOCK_H__
#define __INVISIBLE_BLOCK_H__
#ifndef __INVISIBLE_BLOCK_H__
#define __INVISIBLE_BLOCK_H__
@@
-29,6
+28,8
@@
public:
InvisibleBlock(const Vector& pos);
virtual void draw(DrawingContext& context);
InvisibleBlock(const Vector& pos);
virtual void draw(DrawingContext& context);
+ virtual bool collides(GameObject& other, const CollisionHit& hit);
+ virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
protected:
virtual void hit(Player& player);
protected:
virtual void hit(Player& player);
@@
-38,4
+39,3
@@
private:
};
#endif
};
#endif
-