event feature work; ozone bgm redone

8 files changed, 10 insertions, 7 deletions

diff --git a/entityx/Event.h b/entityx/Event.h
index cb7b3ab..988c9a1 100644
--- a/entityx/Event.h
+++ b/entityx/Event.h
@@ -37,7 +37,7 @@ class BaseEvent {
 };
 
 
-typedef Simple::Signal<void (const void*)> EventSignal;
+typedef Simple::Signal<bool (const void*)> EventSignal;
 typedef std::shared_ptr<EventSignal> EventSignalPtr;
 typedef std::weak_ptr<EventSignal> EventSignalWeakPtr;
 
@@ -123,7 +123,7 @@ class EventManager : entityx::help::NonCopyable {
    */
   template <typename E, typename Receiver>
   void subscribe(Receiver &receiver) {
-    void (Receiver::*receive)(const E &) = &Receiver::receive;
+    bool (Receiver::*receive)(const E &) = &Receiver::receive;
     auto sig = signal_for(Event<E>::family());
     auto wrapper = EventCallbackWrapper<E>(std::bind(receive, &receiver, std::placeholders::_1));
     auto connection = sig->connect(wrapper);
@@ -205,9 +205,9 @@ class EventManager : entityx::help::NonCopyable {
   // Functor used as an event signal callback that casts to E.
   template <typename E>
   struct EventCallbackWrapper {
-    explicit EventCallbackWrapper(std::function<void(const E &)> callback) : callback(callback) {}
-    void operator()(const void *event) { callback(*(static_cast<const E*>(event))); }
-    std::function<void(const E &)> callback;
+    explicit EventCallbackWrapper(std::function<bool(const E &)> callback) : callback(callback) {}
+    bool operator()(const void *event) { return callback(*(static_cast<const E*>(event))); }
+    std::function<bool(const E &)> callback;
   };
 
   std::vector<EventSignalPtr> handlers_;
diff --git a/entityx/Makefile b/entityx/Makefile
index 5deb756..58b18a7 100644
--- a/entityx/Makefile
+++ b/entityx/Makefile
@@ -1,3 +1,5 @@
+# gamedev CHANGE - changed output of libentityx to ../lib/
+
 INC = -I..
 FLG = -std=gnu++11
 
@@ -12,5 +14,6 @@ all:
 	g++ $(INC) $(FLG) -c Event.cc -o out/Event.o
 	g++ $(INC) $(FLG) -c Entity.cc -o out/Entity.o
 	g++ $(INC) $(FLG) -c System.cc -o out/System.o
-	ar rvs libentityx.a out/*.o
-#	g++ out/*.o -shared -o ../entityx.so
\ No newline at end of file
+	ar rvs ../lib/libentityx.a out/*.o
+#	g++ out/*.o -shared -o ../entityx.so
+	rm -rf out
diff --git a/entityx/libentityx.a b/entityx/libentityx.a
index 643acc6..2196a18 100644
--- a/entityx/libentityx.a
+++ b/entityx/libentityx.a
diff --git a/entityx/out/Entity.o b/entityx/out/Entity.o
deleted file mode 100644
index fde66e6..0000000
--- a/entityx/out/Entity.o
+++ /dev/null
diff --git a/entityx/out/Event.o b/entityx/out/Event.o
deleted file mode 100644
index 8f83146..0000000
--- a/entityx/out/Event.o
+++ /dev/null
diff --git a/entityx/out/Pool.o b/entityx/out/Pool.o
deleted file mode 100644
index 4d0bc5d..0000000
--- a/entityx/out/Pool.o
+++ /dev/null
diff --git a/entityx/out/System.o b/entityx/out/System.o
deleted file mode 100644
index 6b38822..0000000
--- a/entityx/out/System.o
+++ /dev/null
diff --git a/entityx/out/Timer.o b/entityx/out/Timer.o
deleted file mode 100644
index fc47589..0000000
--- a/entityx/out/Timer.o
+++ /dev/null