summaryrefslogtreecommitdiffstats
path: root/engine/surface.cpp
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/surface.cpp
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/surface.cpp')
-rw-r--r--engine/surface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/surface.cpp b/engine/surface.cpp
index 31f6388..f4729a5 100644
--- a/engine/surface.cpp
+++ b/engine/surface.cpp
@@ -34,7 +34,7 @@ surface::surface(const char *filename, uint32_t format, SDL_Surface *parent)
surface::surface(SDL_Surface *sdl_surface, SDL_Surface *parent)
- : flat::core::object(), parent(parent), hide(false)
+ : flat::object(), parent(parent), hide(false)
{
this->sdl_surface = new SDL_Surface(*sdl_surface);
@@ -55,7 +55,7 @@ surface::surface(SDL_Surface *sdl_surface, SDL_Surface *parent)
surface::surface(const surface &sprite)
- : flat::core::object(sprite), parent(sprite.parent),
+ : flat::object(sprite), parent(sprite.parent),
hide(sprite.hide)
{
offset = new SDL_Rect(*sprite.offset);