[Super-tux-commit] supertux/src badguy.cpp,1.54,1.55

[Ricardo C. <rm...@us...>]

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

Modified Files:
	badguy.cpp 
Log Message:
Don't give score when flatting a badguy, since this leaves to unfair situations. Besides, we are already giving score for when he kills other enemies...

I also think that we should give (let's say) half of the score, when a badguy is killed by a bullet. Since it is so easy to do that... What do you say?

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- badguy.cpp	27 Apr 2004 17:09:22 -0000	1.54
+++ badguy.cpp	28 Apr 2004 12:13:00 -0000	1.55
@@ -905,9 +905,12 @@
       }
 
     make_player_jump(player);
-	      
-    World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier);
-    player_status.score_multiplier++;
+
+    if((kind != BAD_MRICEBLOCK && mode != dying))
+      {
+      World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier);
+      player_status.score_multiplier++;
+      }
 
     // check for maximum number of squiches
     squishcount++;