diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-17 15:55:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 15:55:37 -0400 |
| commit | 90aadf3844386824140a20d7fbb847bc16009a94 (patch) | |
| tree | 6f83fce90e71abb22b1a8f3e09c79963b2a34d5d /src/components/user_movement.cpp | |
| parent | bc63fa57ced1c7329f7fdcfd168eaf7e290158bc (diff) | |
| parent | 86f0106d0523825549f1e74b835688c78a10cf6c (diff) | |
| download | therapy-90aadf3844386824140a20d7fbb847bc16009a94.tar.gz therapy-90aadf3844386824140a20d7fbb847bc16009a94.tar.bz2 therapy-90aadf3844386824140a20d7fbb847bc16009a94.zip | |
Merge pull request #7 from hatkirby/es-rewrite
The ECS rewrite exceeds the original branch in functionality, so it is time to merge it in.
Diffstat (limited to 'src/components/user_movement.cpp')
| -rw-r--r-- | src/components/user_movement.cpp | 100 |
1 files changed, 0 insertions, 100 deletions
| diff --git a/src/components/user_movement.cpp b/src/components/user_movement.cpp deleted file mode 100644 index e499fee..0000000 --- a/src/components/user_movement.cpp +++ /dev/null | |||
| @@ -1,100 +0,0 @@ | |||
| 1 | #include "user_movement.h" | ||
| 2 | #include "renderer.h" | ||
| 3 | |||
| 4 | void UserMovementComponent::input(Game& game, Entity& entity, int key, int action) | ||
| 5 | { | ||
| 6 | if (action == GLFW_PRESS) | ||
| 7 | { | ||
| 8 | if (key == GLFW_KEY_LEFT) | ||
| 9 | { | ||
| 10 | holdingLeft = true; | ||
| 11 | |||
| 12 | if (!frozen) | ||
| 13 | { | ||
| 14 | entity.send(game, Message::Type::walkLeft); | ||
| 15 | } | ||
| 16 | } else if (key == GLFW_KEY_RIGHT) | ||
| 17 | { | ||
| 18 | holdingRight = true; | ||
| 19 | |||
| 20 | if (!frozen) | ||
| 21 | { | ||
| 22 | entity.send(game, Message::Type::walkRight); | ||
| 23 | } | ||
| 24 | } else if (key == GLFW_KEY_UP) | ||
| 25 | { | ||
| 26 | if (!frozen) | ||
| 27 | { | ||
| 28 | entity.send(game, Message::Type::jump); | ||
| 29 | } | ||
| 30 | } else if (key == GLFW_KEY_DOWN) | ||
| 31 | { | ||
| 32 | if (!frozen) | ||
| 33 | { | ||
| 34 | entity.send(game, Message::Type::canDrop); | ||
| 35 | } | ||
| 36 | } | ||
| 37 | } else if (action == GLFW_RELEASE) | ||
| 38 | { | ||
| 39 | if (key == GLFW_KEY_LEFT) | ||
| 40 | { | ||
| 41 | holdingLeft = false; | ||
| 42 | |||
| 43 | if (!frozen) | ||
| 44 | { | ||
| 45 | if (holdingRight) | ||
| 46 | { | ||
| 47 | entity.send(game, Message::Type::walkRight); | ||
| 48 | } else { | ||
| 49 | entity.send(game, Message::Type::stopWalking); | ||
| 50 | } | ||
| 51 | } | ||
| 52 | } else if (key == GLFW_KEY_RIGHT) | ||
| 53 | { | ||
| 54 | holdingRight = false; | ||
| 55 | |||
| 56 | if (!frozen) | ||
| 57 | { | ||
| 58 | if (holdingLeft) | ||
| 59 | { | ||
| 60 | entity.send(game, Message::Type::walkLeft); | ||
| 61 | } else { | ||
| 62 | entity.send(game, Message::Type::stopWalking); | ||
| 63 | } | ||
| 64 | } | ||
| 65 | } else if (key == GLFW_KEY_DOWN) | ||
| 66 | { | ||
| 67 | if (!frozen) | ||
| 68 | { | ||
| 69 | entity.send(game, Message::Type::cantDrop); | ||
| 70 | } | ||
| 71 | } else if (key == GLFW_KEY_UP) | ||
| 72 | { | ||
| 73 | if (!frozen) | ||
| 74 | { | ||
| 75 | entity.send(game, Message::Type::stopJump); | ||
| 76 | } | ||
| 77 | } | ||
| 78 | } | ||
| 79 | } | ||
| 80 | |||
| 81 | void UserMovementComponent::receive(Game& game, Entity& entity, const Message& msg) | ||
| 82 | { | ||
| 83 | if (msg.type == Message::Type::die) | ||
| 84 | { | ||
| 85 | frozen = true; | ||
| 86 | |||
| 87 | entity.send(game, Message::Type::stopWalking); | ||
| 88 | } else if (msg.type == Message::Type::stopDying) | ||
| 89 | { | ||
| 90 | frozen = false; | ||
| 91 | |||
| 92 | if (holdingLeft) | ||
| 93 | { | ||
| 94 | entity.send(game, Message::Type::walkLeft); | ||
| 95 | } else if (holdingRight) | ||
| 96 | { | ||
| 97 | entity.send(game, Message::Type::walkRight); | ||
| 98 | } | ||
| 99 | } | ||
| 100 | } | ||