From 6c048de80b00a88e9c43290b1e5ccd1dd35e74a4 Mon Sep 17 00:00:00 2001
From: Wolfgang Becker <uafr@gmx.de>
Date: Sun, 10 Feb 2008 21:56:41 +0000
Subject: [PATCH] smartball: a snowball, smart enough to stay on his platform.

SVN-Revision: 5321
---
 .../creatures/snowball/smart-snowball.sprite       |  24 +++++++++++
 data/images/creatures/snowball/snowball.sprite     |   7 ++--
 data/images/creatures/snowball/sport-left-0.png    | Bin 0 -> 2930 bytes
 data/images/creatures/snowball/sport-left-1.png    | Bin 0 -> 2939 bytes
 data/images/creatures/snowball/sport-left-2.png    | Bin 0 -> 3107 bytes
 src/badguy/smartball.cpp                           |  46 +++++++++++++++++++++
 src/badguy/smartball.hpp                           |  41 ++++++++++++++++++
 src/control/joystickkeyboardcontroller.cpp         |   2 -
 8 files changed, 114 insertions(+), 6 deletions(-)
 create mode 100644 data/images/creatures/snowball/smart-snowball.sprite
 create mode 100644 data/images/creatures/snowball/sport-left-0.png
 create mode 100644 data/images/creatures/snowball/sport-left-1.png
 create mode 100644 data/images/creatures/snowball/sport-left-2.png
 create mode 100644 src/badguy/smartball.cpp
 create mode 100644 src/badguy/smartball.hpp

diff --git a/data/images/creatures/snowball/smart-snowball.sprite b/data/images/creatures/snowball/smart-snowball.sprite
new file mode 100644
index 000000000..d10de90c9
--- /dev/null
+++ b/data/images/creatures/snowball/smart-snowball.sprite
@@ -0,0 +1,24 @@
+(supertux-sprite
+  (action
+    (name "left")
+    (hitbox 2 4 31.8 31.8)
+    (images "left-0.png"
+            "left-1.png"
+            "left-2.png")
+  )
+  (action
+    (name "right")
+    (hitbox 2 4 31.8 31.8)
+    (mirror-action "left")
+  )
+  (action
+    (name "squished-left")
+    (hitbox 1 -19 31.8 31.8)
+    (images "squished-left.png")
+  )
+  (action
+    (name "squished-right")
+    (hitbox 1 -19 31.8 31.8)
+    (mirror-action "squished-left")
+  )
+)
diff --git a/data/images/creatures/snowball/snowball.sprite b/data/images/creatures/snowball/snowball.sprite
index d10de90c9..ed9f5dfa7 100644
--- a/data/images/creatures/snowball/snowball.sprite
+++ b/data/images/creatures/snowball/snowball.sprite
@@ -1,10 +1,9 @@
 (supertux-sprite
   (action
     (name "left")
-    (hitbox 2 4 31.8 31.8)
-    (images "left-0.png"
-            "left-1.png"
-            "left-2.png")
+    (images "sport-left-0.png"
+            "sport-left-1.png"
+            "sport-left-2.png")
   )
   (action
     (name "right")
diff --git a/data/images/creatures/snowball/sport-left-0.png b/data/images/creatures/snowball/sport-left-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..82454b90ed3d8f4cf3b60e31513237ffaf2c7606
GIT binary patch
literal 2930
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

literal 0
HcmV?d00001

diff --git a/data/images/creatures/snowball/sport-left-1.png b/data/images/creatures/snowball/sport-left-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..1abb5db5b0179fe47abceea35e243d21befd266b
GIT binary patch
literal 2939
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

literal 0
HcmV?d00001

diff --git a/data/images/creatures/snowball/sport-left-2.png b/data/images/creatures/snowball/sport-left-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e853efeb908d821015307b775b15ba8095abd051
GIT binary patch
literal 3107
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

literal 0
HcmV?d00001

diff --git a/src/badguy/smartball.cpp b/src/badguy/smartball.cpp
new file mode 100644
index 000000000..aaf433bb4
--- /dev/null
+++ b/src/badguy/smartball.cpp
@@ -0,0 +1,46 @@
+//  $Id$
+//
+//  SuperTux - Smart Snowball
+//  Copyright (C) 2008 Wolfgang Becker <uafr@gmx.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  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.
+
+#include <config.h>
+
+#include "smartball.hpp"
+
+SmartBall::SmartBall(const lisp::Lisp& reader)
+	: WalkingBadguy(reader, "images/creatures/snowball/smart-snowball.sprite", "left", "right")
+{
+  walk_speed = 80;
+  max_drop_height = 16;
+}
+
+SmartBall::SmartBall(const Vector& pos, Direction d)
+	: WalkingBadguy(pos, d, "images/creatures/snowball/smart-snowball.sprite", "left", "right")
+{
+  walk_speed = 80;
+  max_drop_height = 16;
+}
+
+bool
+SmartBall::collision_squished(GameObject& object)
+{
+  sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
+  kill_squished(object);
+  return true;
+}
+
+IMPLEMENT_FACTORY(SmartBall, "smartball")
diff --git a/src/badguy/smartball.hpp b/src/badguy/smartball.hpp
new file mode 100644
index 000000000..3631f39bf
--- /dev/null
+++ b/src/badguy/smartball.hpp
@@ -0,0 +1,41 @@
+//  $Id$
+//
+//  SuperTux - Smart Snowball
+//  Copyright (C) 2008 Wolfgang Becker <uafr@gmx.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  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.
+
+#ifndef __SMARTBALL_H__
+#define __SMARTBALL_H__
+
+#include "walking_badguy.hpp"
+
+/*
+ * Easy to kill badguy that does not jump down from it's ledge.
+ */
+class SmartBall : public WalkingBadguy
+{
+public:
+  SmartBall(const lisp::Lisp& reader);
+  SmartBall(const Vector& pos, Direction d);
+
+  virtual SmartBall* clone() const { return new SmartBall(*this); }
+
+protected:
+  bool collision_squished(GameObject& object);
+
+};
+
+#endif
diff --git a/src/control/joystickkeyboardcontroller.cpp b/src/control/joystickkeyboardcontroller.cpp
index 4bf168eac..f9e140865 100644
--- a/src/control/joystickkeyboardcontroller.cpp
+++ b/src/control/joystickkeyboardcontroller.cpp
@@ -198,8 +198,6 @@ JoystickKeyboardController::read(const lisp::Lisp& lisp)
           continue;
         }
         keymap[(SDLKey) key] = (Control)i;
-      } else {
-        log_info << "Invalid lisp element '" << iter.item() << "' in keymap" << std::endl;
       }
     }
   }
-- 
2.11.0