super-tux-commit

[Marek M. <wa...@us...>]

Update of /cvsroot/super-tux/supertux/src/object
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7595/src/object

Modified Files:
	player.cpp 
Added Files:
	invisible_tile.cpp invisible_tile.h 
Log Message:
patch contributed by markos_64:
-adds invisible tile (permanent, cannot be bumped)
-add spiky to sector.cpp (which someone apparantly forgot to do)
-fixed fireballs appearing behind tux

added an invisible tile to simple.stl, for testing


Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/object/player.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- player.cpp	26 Nov 2004 14:45:41 -0000	1.1
+++ player.cpp	27 Nov 2004 14:14:30 -0000	1.2
@@ -661,7 +661,9 @@
   /* Shoot! */
   if (input.fire == DOWN && input.old_fire == UP && got_power != NONE_POWER) {
     if(Sector::current()->add_bullet(
-          get_pos() + Vector(0, bbox.get_height()/2),
+//           get_pos() + Vector(0, bbox.get_height()/2),
+	   get_pos() + ((dir == LEFT)? Vector(0, bbox.get_height()/2) 
+	   : Vector(32, bbox.get_height()/2)),
           physic.get_velocity_x(), dir))
       shooting_timer.start(SHOOTING_TIME);
     input.old_fire = DOWN;

--- NEW FILE: invisible_tile.h ---
#ifndef __INBUMPABLE_BLOCK_H__
#define __INBUMPABLE_BLOCK_H__

#include "block.h"

class InvisibleTile : public Block
{
public:
  InvisibleTile(const Vector& pos);

  virtual void draw(DrawingContext& context);

protected:
  virtual void hit(Player& player);

private:
  bool visible;
};

#endif


--- NEW FILE: invisible_tile.cpp ---
#include <config.h>

#include "invisible_tile.h"
#include "resources.h"
#include "special/sprite.h"
#include "special/sprite_manager.h"
#include "video/drawing_context.h"

InvisibleTile::InvisibleTile(const Vector& pos)
  : Block(pos, sprite_manager->create("invisibleblock")), visible(false)
{
  flags |= FLAG_SOLID;
}

void
InvisibleTile::draw(DrawingContext& context)
{
}

void
InvisibleTile::hit(Player& )
{
}