diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-18 15:25:52 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-18 15:25:52 -0500 |
commit | e4e2f2d2a7b6a282b9618aa0004d9453936f43c6 (patch) | |
tree | de1653dc8b5992420147f28d9fb4de052ea1845f /src/systems/mapping.cpp | |
parent | e16fb5be90c889c371cbb0ca2444735c2e12073c (diff) | |
download | therapy-e4e2f2d2a7b6a282b9618aa0004d9453936f43c6.tar.gz therapy-e4e2f2d2a7b6a282b9618aa0004d9453936f43c6.tar.bz2 therapy-e4e2f2d2a7b6a282b9618aa0004d9453936f43c6.zip |
Added player death and event scheduling
Also added ability to make sprites flicker, to freeze physics for an entity, and to freeze progression of a sprite's animation loop.
Diffstat (limited to 'src/systems/mapping.cpp')
-rw-r--r-- | src/systems/mapping.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/systems/mapping.cpp b/src/systems/mapping.cpp index 05167c1..a3a17ec 100644 --- a/src/systems/mapping.cpp +++ b/src/systems/mapping.cpp | |||
@@ -167,11 +167,32 @@ void MappingSystem::loadMap(size_t mapId) | |||
167 | } else if (tile == 42) | 167 | } else if (tile == 42) |
168 | { | 168 | { |
169 | addBoundary( | 169 | addBoundary( |
170 | mappable.getRightBoundaries(), | ||
171 | x * TILE_WIDTH, | ||
172 | y * TILE_HEIGHT, | ||
173 | (y+1) * TILE_HEIGHT, | ||
174 | MappableComponent::Boundary::Type::danger); | ||
175 | |||
176 | addBoundary( | ||
177 | mappable.getLeftBoundaries(), | ||
178 | (x+1) * TILE_WIDTH, | ||
179 | y * TILE_HEIGHT, | ||
180 | (y+1) * TILE_HEIGHT, | ||
181 | MappableComponent::Boundary::Type::danger); | ||
182 | |||
183 | addBoundary( | ||
170 | mappable.getDownBoundaries(), | 184 | mappable.getDownBoundaries(), |
171 | y * TILE_HEIGHT, | 185 | y * TILE_HEIGHT, |
172 | x * TILE_WIDTH, | 186 | x * TILE_WIDTH, |
173 | (x+1) * TILE_WIDTH, | 187 | (x+1) * TILE_WIDTH, |
174 | MappableComponent::Boundary::Type::danger); | 188 | MappableComponent::Boundary::Type::danger); |
189 | |||
190 | addBoundary( | ||
191 | mappable.getUpBoundaries(), | ||
192 | (y+1) * TILE_HEIGHT, | ||
193 | x * TILE_WIDTH, | ||
194 | (x+1) * TILE_WIDTH, | ||
195 | MappableComponent::Boundary::Type::danger); | ||
175 | } | 196 | } |
176 | } | 197 | } |
177 | } | 198 | } |