X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.hpp;h=872d2acb0e45d0ff9194d528aabe9fc27180c387;hb=4c9b57d29e67f9db5605f378549b07f670baa837;hp=6980ba9a19a0f531ffbb085a65dd9ed1bd0f62ae;hpb=209464e1ecefabfaa671c063195bad8b0bdf6d8f;p=supertux.git

diff --git a/src/badguy/badguy.hpp b/src/badguy/badguy.hpp
index 6980ba9a1..872d2acb0 100644
--- a/src/badguy/badguy.hpp
+++ b/src/badguy/badguy.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,11 +12,11 @@
 //  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
-//  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 __BADGUY_H__
 #define __BADGUY_H__
 
@@ -72,7 +72,7 @@ public:
   /** Writes out the badguy into the included lisp::Writer. Useful e.g. when
    * converting an old-format level to the new format.
    */
-  virtual void save(lisp::Writer& );
+  virtual void save(lisp::Writer& writer);
 
   Vector get_start_position() const
   {
@@ -131,11 +131,9 @@ protected:
   { return state; }
     
   /**
-   * returns a pointer to the player, try to avoid this function to avoid
-   * problems later when we have multiple players or no player in scripted
-   * sequence.
+   * returns a pointer to the nearest player or 0 if no player is available
    */
-  Player* get_player();
+  Player* get_nearest_player();
   
   Sprite* sprite;
   Physic physic;
@@ -151,6 +149,7 @@ protected:
    * Checks if the badguy may fall off a platform if continuing a given movement.
    */
   bool may_fall_off_platform();
+  bool might_fall(int height); /**< returns true if we might soon fall at least @c height pixels. Minimum value for height is 1 pixel */
 
   Vector start_position;