summaryrefslogtreecommitdiffstats
path: root/engine/include/surface.hpp
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/surface.hpp
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/surface.hpp')
-rw-r--r--engine/include/surface.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/include/surface.hpp b/engine/include/surface.hpp
index 5364e8e..6e9026a 100644
--- a/engine/include/surface.hpp
+++ b/engine/include/surface.hpp
@@ -1,13 +1,13 @@
#ifndef __FLATSURFACE_H__
#define __FLATSURFACE_H__
-#include "core/object.hpp"
+#include "object.hpp"
#include "core/labelled.hpp"
#include <SDL2/SDL.h>
namespace flat {
-class surface : virtual public core::object, virtual public core::labelled
+class surface : virtual public object, virtual public core::labelled
{
SDL_Surface * sdl_surface;
SDL_Surface * parent;