diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-20 13:04:41 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-20 13:04:41 -0500 |
commit | 996076cf151a27a7a8d278aa4d15b28cfb196c46 (patch) | |
tree | 96a2fdcf3fd5a22394313d140cacc0257a821543 /src/main.cpp | |
parent | ee802c01d3008e6019bc55a02fcc2e6d68b288d1 (diff) | |
download | tanetane-996076cf151a27a7a8d278aa4d15b28cfb196c46.tar.gz tanetane-996076cf151a27a7a8d278aa4d15b28cfb196c46.tar.bz2 tanetane-996076cf151a27a7a8d278aa4d15b28cfb196c46.zip |
Added a randomly wandering Ionia to the map
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index f220dc0..9f503e1 100644 --- a/src/main.cpp +++ b/src/main.cpp | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <iostream> | 1 | #include <iostream> |
2 | #include <memory> | 2 | #include <memory> |
3 | #include <random> | ||
3 | #include "renderer.h" | 4 | #include "renderer.h" |
4 | #include "game.h" | 5 | #include "game.h" |
5 | #include "timer.h" | 6 | #include "timer.h" |
@@ -12,12 +13,14 @@ | |||
12 | #include "message_system.h" | 13 | #include "message_system.h" |
13 | #include "script_system.h" | 14 | #include "script_system.h" |
14 | #include "effect_system.h" | 15 | #include "effect_system.h" |
16 | #include "behaviour_system.h" | ||
15 | 17 | ||
16 | void loop(Renderer& renderer) { | 18 | void loop(Renderer& renderer, std::mt19937& rng) { |
17 | Game game(renderer); | 19 | Game game(renderer, rng); |
18 | game.emplaceSystem<ScriptSystem>(); | 20 | game.emplaceSystem<ScriptSystem>(); |
19 | game.emplaceSystem<TransformSystem>(); | 21 | game.emplaceSystem<TransformSystem>(); |
20 | game.emplaceSystem<InputSystem>(); | 22 | game.emplaceSystem<InputSystem>(); |
23 | game.emplaceSystem<BehaviourSystem>(); | ||
21 | game.emplaceSystem<CharacterSystem>(); | 24 | game.emplaceSystem<CharacterSystem>(); |
22 | game.emplaceSystem<AnimationSystem>(); | 25 | game.emplaceSystem<AnimationSystem>(); |
23 | game.emplaceSystem<CameraSystem>(); | 26 | game.emplaceSystem<CameraSystem>(); |
@@ -26,7 +29,7 @@ void loop(Renderer& renderer) { | |||
26 | 29 | ||
27 | game.loadMap("map2"); | 30 | game.loadMap("map2"); |
28 | 31 | ||
29 | vec2i warpLoc = game.getMap().getWarpPoint("debugWarp_mailboxes"); | 32 | vec2i warpLoc = game.getMap().getWarpPoint("debugWarp_rightside"); |
30 | 33 | ||
31 | int lucasSprite = game.emplaceSprite("lucas"); | 34 | int lucasSprite = game.emplaceSprite("lucas"); |
32 | game.getSystem<TransformSystem>().initSprite(lucasSprite, warpLoc); | 35 | game.getSystem<TransformSystem>().initSprite(lucasSprite, warpLoc); |
@@ -83,11 +86,14 @@ void loop(Renderer& renderer) { | |||
83 | } | 86 | } |
84 | 87 | ||
85 | int main(int, char**) { | 88 | int main(int, char**) { |
89 | std::random_device randomEngine; | ||
90 | std::mt19937 rng(randomEngine()); | ||
91 | |||
86 | try | 92 | try |
87 | { | 93 | { |
88 | Renderer renderer; | 94 | Renderer renderer; |
89 | 95 | ||
90 | loop(renderer); | 96 | loop(renderer, rng); |
91 | } catch (const sdl_error& ex) | 97 | } catch (const sdl_error& ex) |
92 | { | 98 | { |
93 | std::cout << "SDL error (" << ex.what() << ")" << std::endl; | 99 | std::cout << "SDL error (" << ex.what() << ")" << std::endl; |