arch linux prefers pkgconfig for finding lua

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 28e588b627da8ccc0b45b49dc80cbac1b37fc258..4140d17249e2b8d822a31c8e8893e09737ef78b4 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -1,46 +1,29 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _CHARACTER_HH_
 #define _CHARACTER_HH_
 
+#include <string>
+
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Aabb.hh>
 #include <Moof/Entity.hh>
 #include <Moof/Math.hh>
-#include <Moof/Octree.hh>
 #include <Moof/RigidBody.hh>
 #include <Moof/Sphere.hh>
+#include <Moof/Texture.hh>
 
 #include "Animation.hh"
-#include "Tilemap.hh"
-
 
 
 class Character;
@@ -52,7 +35,7 @@ typedef boost::shared_ptr<Character> CharacterP;
  * includes the heroine herself and the bad guys.
  */
 
-class Character : public Mf::RigidBody2, public Mf::OctreeInsertable
+class Character : public Mf::RigidBody2
 {
 public:
 
@@ -62,24 +45,16 @@ public:
        virtual void update(Mf::Scalar t, Mf::Scalar dt);
        virtual void draw(Mf::Scalar alpha) const;
 
-       void setZCoord(Mf::Scalar z);
-
        void addImpulse(Mf::Vector2 impulse);
        void addForce(Mf::Vector2 force);
        void setPosition(Mf::Vector2 position);
 
-       virtual int getOctant(const Mf::Aabb& aabb) const;
+       //virtual int getOctant(const Mf::Aabb<3>& aabb) const;
 
-       Tilemap         tilemap;
+       Mf::Texture     tilemap;
        Animation       animation;
-
-private:
-
-       mutable Mf::Scalar mZCoord;
 };
 
 
 #endif // _CHARACTER_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-