ADDED move event to track character movement and entering/exitting of…

… zones

src/py-wrappers/adonthell/py_world.i

@@ -9,6 +9,7 @@
 #include "world/character.h"
 #include "world/mapview.h"
 #include "world/schedule.h"
+#include "world/move_event.h"
 
 using namespace world;
 
@@ -18,7 +19,8 @@ using namespace world;
 %include "std_string.i"
 
 %import "base/types.h"
-%import "py_gfx.i"
+%import(module="event") "event/event.h"
+%import(module="gfx") "gfx/drawable.h"
 
 // typemap for returning a string pointer as python string
 %typemap(out) std::string * {
@@ -48,6 +50,7 @@ using namespace world;
 %include "world/placeable.h"
 %include "world/object.h"
 %include "world/coordinates.h"
+%include "world/move_event.h"
 %include "world/moving.h"
 %include "world/action.h"
 %include "world/character.h"

src/world/CMakeLists.txt

@@ -9,6 +9,8 @@ set(adonthell_world_SRCS
     chunk.cc
     chunk_info.cc
     mapview.cc
+    move_event.cc
+    move_event_manager.cc
     moving.cc
     object.cc
     placeable.cc
@@ -37,29 +39,31 @@ set(adonthell_world_HEADERS
     chunk_info.h
     entity.h
     mapview.h
+    move_event.h
+    move_event_manager.h
     moving.h
-	 node.h
-	 node_cache.h
-	 node_bank.h
+	node.h
+	node_cache.h
+	node_bank.h
     object.h
-	 open_list.h
+	open_list.h
     placeable.h
     placeable_model.h
     placeable_shape.h
     plane3.h
-	 pathfinding.h
-	 pathfinding_manager.h
-	 pathfinding_task.h
+	pathfinding.h
+	pathfinding_manager.h
+	pathfinding_task.h
     render_info.h
     renderer.h
-	 schedule.h
-	 schedule_data.h
+	schedule.h
+	schedule_data.h
     shadow.h
     shadow_info.h
     triangle3.h
     vector3.h
     world.h
-	 zone.h
+	zone.h
 )
 
 

src/world/Makefile.am

@@ -15,6 +15,8 @@ pkgincludeworld_HEADERS = \
     cube3.h \
     entity.h \
     mapview.h \
+    move_event.h \
+    move_event_manager.h \
     moving.h \
     node_bank.h \
     node_cache.h \
@@ -53,6 +55,8 @@ libadonthell_world_la_SOURCES = \
     collision.cc \
     cube3.cc \
     mapview.cc \
+    move_event.cc \
+    move_event_manager.cc \
     moving.cc \
     object.cc \
     placeable.cc \

src/world/area.cc

@@ -177,7 +177,7 @@ void area::remove_zone (world::zone * zone)
 }
 
 // retrieve zone with a certain name
-world::zone * area::get_zone (std::string & name)
+world::zone * area::get_zone (const std::string & name) const
 {
     std::list<world::zone *>::const_iterator i;
 

src/world/area.h

@@ -139,7 +139,7 @@ namespace world
          * @return a pointer to the zone, or NULL on error
          * @note name is case-sensitive
          */
-        world::zone *get_zone(std::string & name);
+        world::zone *get_zone(const std::string & name) const;
 
         /**
          * Return all zones that contain the given point of given type.

src/world/move_event.cc

@@ -0,0 +1,105 @@
+/*
+   Copyright (C) 2012 Kai Sterker <kai.sterker@gmail.com>
+   Part of the Adonthell Project http://adonthell.nongnu.org
+
+   Adonthell 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.
+
+   Adonthell 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 Adonthell; if not, write to the Free Software 
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/**
+ * @file 	world/move_event.cc
+ *
+ * @author 	Kai Sterker
+ * @brief 	Declares the move_event class.
+ */
+
+#include "base/logging.h"
+#include "world/move_event.h"
+#include "world/area_manager.h"
+
+using world::move_event;
+
+// constructor
+move_event::move_event (const world::area *map, const std::string & actor, const std::string & check_enter, const std::string & check_leave)
+{
+    Actor = (world::moving *) map->get_entity(actor);
+    CheckEnter = map->get_zone(check_enter);
+    CheckLeave = map->get_zone(check_leave);
+
+    if (check_leave != check_enter && check_leave != "")
+    {
+        LOG(WARNING) << "move_event: ignoring leave check (must be same as enter or \"\")";
+        CheckLeave = NULL;
+    }
+}
+
+// test two move events for equality
+bool move_event::equals (const events::event * e) const
+{
+    const move_event *evt = (const move_event*) e;
+
+    // actor && (enter || leave)
+    if (Actor != evt->actor()) return false;
+
+    bool equals = true;
+
+    if (CheckEnter != NULL)
+    {
+        if (!CheckEnter->contains (evt->start()) && CheckEnter->contains(evt->end())) equals = true;
+        else equals = false;
+    }
+
+    if (CheckLeave != NULL)
+    {
+        if (CheckLeave->contains (evt->start()) && !CheckLeave->contains(evt->end())) equals = true;
+        else equals = false;
+    }
+
+    return equals;
+}
+
+// save move event
+void move_event::put_state (base::flat& file) const
+{
+    // save basic event data first
+    event::put_state (file);
+
+    // save move event data
+    file.put_string ("mva", Actor ? Actor->uid() : "");
+    file.put_string ("mve", CheckEnter ? CheckEnter->name() : "");
+    file.put_string ("mvl", CheckLeave ? CheckLeave->name() : "");
+}
+
+// load move event
+bool move_event::get_state (base::flat& file)
+{
+    // get basic event data
+    if (event::get_state (file))
+    {   
+        const world::area *map = world::area_manager::get_map();
+
+        // get move event data
+        std::string actor = file.get_string("mva");
+        if (actor != "") Actor = (world::moving*) map->get_entity(actor);
+
+        std::string check_enter = file.get_string("mve");
+        if (check_enter != "") CheckEnter = map->get_zone(check_enter);
+
+        std::string check_leave = file.get_string("mvl");
+        if (check_leave != "") CheckLeave = map->get_zone(check_leave);
+    }
+
+    return file.success ();
+}
+