[Super-tux-commit] supertux/src/badguy badguy.cpp,1.3,1.4 bomb.cpp,1.1,1.2 bouncing_snowball.cpp,1.1,1.2 jumpy.cpp,1.1,1.2 mrbomb.cpp,1.1,1.2 mriceblock.cpp,1.1,1.2 snowball.cpp,1.1,1.2 spiky.cpp,1.1,1.2

[Matze B. <mat...@us...>]

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

Modified Files:
	badguy.cpp bomb.cpp bouncing_snowball.cpp jumpy.cpp mrbomb.cpp 
	mriceblock.cpp snowball.cpp spiky.cpp 
Log Message:
added jam build system, please try it out - the advantage would be that it already supports all the stuff we need

Index: bomb.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/bomb.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bomb.cpp	20 Nov 2004 22:14:39 -0000	1.1
+++ bomb.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -18,13 +18,13 @@
 }
 
 void
-Bomb::write(LispWriter& writer)
+Bomb::write(LispWriter& )
 {
   // bombs are only temporarily so don't write them out...
 }
 
 HitResponse
-Bomb::collision_solid(GameObject& other, const CollisionHit& hit)
+Bomb::collision_solid(GameObject& , const CollisionHit& hit)
 {
   if(fabsf(hit.normal.y) > .5)
     physic.set_velocity_y(0);
@@ -33,7 +33,7 @@
 }
 
 HitResponse
-Bomb::collision_player(Player& player, const CollisionHit& hit)
+Bomb::collision_player(Player& player, const CollisionHit& )
 {
   if(state == 1) {
     player.kill(Player::SHRINK);
@@ -42,7 +42,7 @@
 }
 
 void
-Bomb::active_action(float elapsed_time)
+Bomb::active_action(float )
 {
   switch(state) {
     case 0:

Index: bouncing_snowball.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/bouncing_snowball.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bouncing_snowball.cpp	20 Nov 2004 22:14:39 -0000	1.1
+++ bouncing_snowball.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -40,7 +40,7 @@
 }
 
 HitResponse
-BouncingSnowball::collision_solid(GameObject& other, const CollisionHit& hit)
+BouncingSnowball::collision_solid(GameObject& , const CollisionHit& hit)
 {
   if(hit.normal.y < -.5) { // hit floor
     physic.set_velocity_y(JUMPSPEED);

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/badguy.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- badguy.cpp	22 Nov 2004 23:47:50 -0000	1.3
+++ badguy.cpp	23 Nov 2004 16:47:26 -0000	1.4
@@ -81,7 +81,7 @@
 }
 
 void
-BadGuy::inactive_action(float elapsed_time)
+BadGuy::inactive_action(float )
 {
 }
 
@@ -118,7 +118,7 @@
 }
 
 HitResponse
-BadGuy::collision_solid(GameObject& other, const CollisionHit& hit)
+BadGuy::collision_solid(GameObject& , const CollisionHit& )
 {
   return FORCE_MOVE;
 }
@@ -139,13 +139,13 @@
 }
 
 HitResponse
-BadGuy::collision_badguy(BadGuy& other, const CollisionHit& hit)
+BadGuy::collision_badguy(BadGuy& , const CollisionHit& )
 {
   return FORCE_MOVE;
 }
 
 bool
-BadGuy::collision_squished(Player& player)
+BadGuy::collision_squished(Player& )
 {
   return false;
 }

Index: mriceblock.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/mriceblock.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mriceblock.cpp	20 Nov 2004 22:14:39 -0000	1.1
+++ mriceblock.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -46,7 +46,7 @@
 }
 
 HitResponse
-MrIceBlock::collision_solid(GameObject& other, const CollisionHit& hit)
+MrIceBlock::collision_solid(GameObject& , const CollisionHit& hit)
 {
   if(fabsf(hit.normal.y) > .5) { // floor or roof
     physic.set_velocity_y(0);

Index: snowball.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/snowball.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snowball.cpp	20 Nov 2004 22:14:39 -0000	1.1
+++ snowball.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -39,7 +39,7 @@
 }
 
 HitResponse
-SnowBall::collision_solid(GameObject& other, const CollisionHit& hit)
+SnowBall::collision_solid(GameObject& , const CollisionHit& hit)
 {
   if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
     physic.set_velocity_y(0);

Index: jumpy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/jumpy.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jumpy.cpp	20 Nov 2004 22:14:39 -0000	1.1
+++ jumpy.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -24,7 +24,7 @@
 }
 
 HitResponse
-Jumpy::collision_solid(GameObject& other, const CollisionHit& hit)
+Jumpy::collision_solid(GameObject& , const CollisionHit& hit)
 {
   // hit floor?
   if(hit.normal.y < -.5) {

Index: mrbomb.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/mrbomb.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mrbomb.cpp	20 Nov 2004 22:14:39 -0000	1.1
+++ mrbomb.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -41,7 +41,7 @@
 }
 
 HitResponse
-MrBomb::collision_solid(GameObject& other, const CollisionHit& hit)
+MrBomb::collision_solid(GameObject& , const CollisionHit& hit)
 {
   if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
     physic.set_velocity_y(0);

Index: spiky.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/spiky.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- spiky.cpp	20 Nov 2004 22:14:40 -0000	1.1
+++ spiky.cpp	23 Nov 2004 16:47:26 -0000	1.2
@@ -31,7 +31,7 @@
 }
 
 HitResponse
-Spiky::collision_solid(GameObject& other, const CollisionHit& hit)
+Spiky::collision_solid(GameObject& , const CollisionHit& hit)
 {
   if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
     physic.set_velocity_y(0);