summary refs log tree commit diff stats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2021-02-10 12:11:27 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2021-02-10 12:11:27 -0500
commit31dc0e443efc0aae48e11a0d98e699dbed5c7dcf (patch)
tree17e044698531fc1af82dddcbd144ae93d3ae0252 /src/main.cpp
parentfb58cb31804da7e5e40fc861927060a183962441 (diff)
downloadtanetane-31dc0e443efc0aae48e11a0d98e699dbed5c7dcf.tar.gz
tanetane-31dc0e443efc0aae48e11a0d98e699dbed5c7dcf.tar.bz2
tanetane-31dc0e443efc0aae48e11a0d98e699dbed5c7dcf.zip
Added fade out around map change
Also moved script system first in the loop so that the camera can catch up before rendering. Also added a map change from map 2 back to map 1.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 5f28408..8487077 100644 --- a/src/main.cpp +++ b/src/main.cpp
@@ -14,13 +14,13 @@
14 14
15void loop(Renderer& renderer) { 15void loop(Renderer& renderer) {
16 Game game(renderer); 16 Game game(renderer);
17 game.emplaceSystem<ScriptSystem>();
17 game.emplaceSystem<TransformSystem>(); 18 game.emplaceSystem<TransformSystem>();
18 game.emplaceSystem<InputSystem>(); 19 game.emplaceSystem<InputSystem>();
19 game.emplaceSystem<CharacterSystem>(); 20 game.emplaceSystem<CharacterSystem>();
20 game.emplaceSystem<AnimationSystem>(); 21 game.emplaceSystem<AnimationSystem>();
21 game.emplaceSystem<CameraSystem>(); 22 game.emplaceSystem<CameraSystem>();
22 game.emplaceSystem<MessageSystem>(); 23 game.emplaceSystem<MessageSystem>();
23 game.emplaceSystem<ScriptSystem>();
24 24
25 game.loadMap("../res/maps/map1.tmx", "spawn"); 25 game.loadMap("../res/maps/map1.tmx", "spawn");
26 26