summaryrefslogtreecommitdiffstats
path: root/engine/flatland.cpp
diff options
context:
space:
mode:
authorancarola <raffaele.ancarola@epfl.ch>2019-01-20 01:19:26 +0100
committerancarola <raffaele.ancarola@epfl.ch>2019-01-20 01:19:26 +0100
commit6c0c2f6f10e86986087c71a2964974ebcd939a3f (patch)
tree0a16aff4380188c6ee222579dbb55392a230dbc0 /engine/flatland.cpp
parentIgnore swap files (diff)
downloadflatland-6c0c2f6f10e86986087c71a2964974ebcd939a3f.tar.gz
flatland-6c0c2f6f10e86986087c71a2964974ebcd939a3f.zip
Test 3 partially executed
Diffstat (limited to 'engine/flatland.cpp')
-rw-r--r--engine/flatland.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/engine/flatland.cpp b/engine/flatland.cpp
index cbb9842..2f1c920 100644
--- a/engine/flatland.cpp
+++ b/engine/flatland.cpp
@@ -130,6 +130,17 @@ int init_flatland(FlatWindow* w, gameloop loop, const flat_status& s, float _fps
try {
try {
+
+ /* Execute tasks */
+ task_s::executePreProcess();
+
+ } catch (const exception &e) {
+
+ cerr << "Flatland: exception thrown while executing pre-process tasks" << endl;
+ cerr << e.what() << endl;
+ }
+
+ try {
/* Execute loop function */
loop_function(flatland_dt);
@@ -143,11 +154,11 @@ int init_flatland(FlatWindow* w, gameloop loop, const flat_status& s, float _fps
try {
/* Execute tasks */
- task_s::executeAll();
+ task_s::executePostProcess();
} catch (const exception &e) {
- cerr << "Flatland: exception thrown while executing tasks" << endl;
+ cerr << "Flatland: exception thrown while executing post-process tasks" << endl;
cerr << e.what() << endl;
}