diff options
author | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-22 01:56:51 +0100 |
---|---|---|
committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-22 01:56:51 +0100 |
commit | 844926711489c4f87c68ceab3ea245161228ad78 (patch) | |
tree | 2d983c826131b33a207db83f95e365b044227dad /engine/flatland.cpp | |
parent | Signal change (diff) | |
download | flatland-844926711489c4f87c68ceab3ea245161228ad78.tar.gz flatland-844926711489c4f87c68ceab3ea245161228ad78.zip |
Fin qui tutto bene
Diffstat (limited to 'engine/flatland.cpp')
-rw-r--r-- | engine/flatland.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/flatland.cpp b/engine/flatland.cpp index 2f1c920..b53f8e4 100644 --- a/engine/flatland.cpp +++ b/engine/flatland.cpp @@ -10,14 +10,14 @@ using namespace std; #include "flattask.h" -#include "flatsignal.h" +#include "signal.h" #include "flatwindow.h" #include "flatexception.h" #include "exceptions/forcequit.h" float flatland_dt; -set<FlatObject*> objects; +set<flat::core::object*> objects; FlatWindow * window = 0; SignalChannel * core = 0; @@ -60,7 +60,7 @@ Uint32 status_to_flags(const flat_status& s) /* Listen to simple quit calls */ class QuitListener : public FlatListener { - virtual void callback(FlatObject*, void*) override + virtual void callback(flat::core::object*, void*) override { /* Order to quit */ quit_flatland(); |