diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2019-02-16 12:12:42 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2019-02-16 12:12:42 -0500 |
commit | 9d9fe5b1d8ac5f8c7fe03e0d77591e71acf41af7 (patch) | |
tree | 72d0331ec91b4fb193c5733ddddc953d19eda9d1 /src/main.cpp | |
parent | a34396730c8d993fea84a454690bd13ea9a9b403 (diff) | |
download | dispatcher-9d9fe5b1d8ac5f8c7fe03e0d77591e71acf41af7.tar.gz dispatcher-9d9fe5b1d8ac5f8c7fe03e0d77591e71acf41af7.tar.bz2 dispatcher-9d9fe5b1d8ac5f8c7fe03e0d77591e71acf41af7.zip |
Pushing works now
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4dce6a5..c041cf8 100644 --- a/src/main.cpp +++ b/src/main.cpp | |||
@@ -15,21 +15,19 @@ int main(int, char**) | |||
15 | 15 | ||
16 | Simulation::id_type player = sim.emplaceEntity(); | 16 | Simulation::id_type player = sim.emplaceEntity(); |
17 | Entity& entity = sim.getEntity(player); | 17 | Entity& entity = sim.getEntity(player); |
18 | entity.gridPos.x() = 1; | ||
19 | entity.gridPos.y() = 5; | ||
20 | entity.size = TILE_SIZE; | 18 | entity.size = TILE_SIZE; |
21 | entity.speed = 3.0; | 19 | entity.speed = 3.0; |
22 | entity.controllable = true; | 20 | entity.controllable = true; |
23 | entity.colliderType = ColliderType::player; | 21 | entity.colliderType = ColliderType::player; |
24 | entity.colorVal = 180; | 22 | entity.colorVal = 180; |
23 | sim.setGridPos(player, vec2s { 1, 5 } ); | ||
25 | 24 | ||
26 | Simulation::id_type crateId = sim.emplaceEntity(); | 25 | Simulation::id_type crateId = sim.emplaceEntity(); |
27 | Entity& crate = sim.getEntity(crateId); | 26 | Entity& crate = sim.getEntity(crateId); |
28 | crate.gridPos.x() = 4; | ||
29 | crate.gridPos.y() = 5; | ||
30 | crate.size = TILE_SIZE; | 27 | crate.size = TILE_SIZE; |
31 | crate.speed = 4.0; | 28 | crate.speed = 4.0; |
32 | crate.playerCanPush = true; | 29 | crate.playerCanPush = true; |
30 | sim.setGridPos(crateId, vec2s { 4, 5 } ); | ||
33 | 31 | ||
34 | bool quit = false; | 32 | bool quit = false; |
35 | 33 | ||