summaryrefslogtreecommitdiffstats
path: root/engine/flatwindow.cpp
diff options
context:
space:
mode:
authorancarola <raffaele.ancarola@epfl.ch>2019-01-22 01:56:51 +0100
committerancarola <raffaele.ancarola@epfl.ch>2019-01-22 01:56:51 +0100
commit844926711489c4f87c68ceab3ea245161228ad78 (patch)
tree2d983c826131b33a207db83f95e365b044227dad /engine/flatwindow.cpp
parentSignal change (diff)
downloadflatland-844926711489c4f87c68ceab3ea245161228ad78.tar.gz
flatland-844926711489c4f87c68ceab3ea245161228ad78.zip
Fin qui tutto bene
Diffstat (limited to 'engine/flatwindow.cpp')
-rw-r--r--engine/flatwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/flatwindow.cpp b/engine/flatwindow.cpp
index ff17274..2ff99dc 100644
--- a/engine/flatwindow.cpp
+++ b/engine/flatwindow.cpp
@@ -3,7 +3,7 @@
#include <SDL2/SDL.h>
#include <iostream>
#include "flatlayer.h"
-#include "flatsignal.h"
+#include "signal.h"
using namespace std;
@@ -47,7 +47,7 @@ FlatWindow::FlatWindow( int width, int height,
FlatWindow::FlatWindow(const FlatWindow& win)
- : FlatObject(win),
+ : flat::core::object(win),
title(win.title), status(win.status),
sdl_window(0), screen(0)
{