summaryrefslogtreecommitdiffstats
path: root/engine/include/serial
diff options
context:
space:
mode:
authorancarola <raffaele.ancarola@epfl.ch>2019-01-25 23:47:41 +0100
committerancarola <raffaele.ancarola@epfl.ch>2019-01-25 23:47:41 +0100
commit351f83b6d331eef1fb5e1cbfa8bed25da8f96a57 (patch)
tree2a7ac7dc499f5b764caba981002e7a17bc1687d0 /engine/include/serial
parentCore channel in flatland and signal test (diff)
downloadflatland-351f83b6d331eef1fb5e1cbfa8bed25da8f96a57.tar.gz
flatland-351f83b6d331eef1fb5e1cbfa8bed25da8f96a57.zip
Template error on compile signal test
Diffstat (limited to 'engine/include/serial')
-rw-r--r--engine/include/serial/focusable.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/include/serial/focusable.hpp b/engine/include/serial/focusable.hpp
index f139577..8a05051 100644
--- a/engine/include/serial/focusable.hpp
+++ b/engine/include/serial/focusable.hpp
@@ -1,14 +1,14 @@
#ifndef __FOCUSABLE_H__
#define __FOCUSABLE_H__
-#include "core/object.hpp"
+#include "object.hpp"
#include "types.hpp"
union SDL_Event;
namespace flat {
-class Focusable : virtual public flat::core::object
+class Focusable : virtual public flat::object
{
bool focused;