projects
/
hackover2013-badge-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sprites in Repo geworfen (damit nichts verlorengeht)
[hackover2013-badge-firmware.git]
/
badge
/
jumpnrun
/
enemies.c
diff --git
a/badge/jumpnrun/enemies.c
b/badge/jumpnrun/enemies.c
index
09a8764
..
cc72db3
100644
(file)
--- a/
badge/jumpnrun/enemies.c
+++ b/
badge/jumpnrun/enemies.c
@@
-139,11
+139,15
@@
void enemy_collision_tiles_bounce_horiz(jumpnrun_enemy *self,
jumpnrun_tile_range const *visible_tiles) {
vec2d inertia_mod = self->base.inertia;
jumpnrun_tile_range const *visible_tiles) {
vec2d inertia_mod = self->base.inertia;
- collisions_tiles_displace(desired_position,
- &self->base,
- lv,
- visible_tiles,
- &inertia_mod);
+ bool killed = collisions_tiles_displace(desired_position,
+ &self->base,
+ lv,
+ visible_tiles,
+ &inertia_mod);
+
+ if(killed) {
+ self->flags &= ~JUMPNRUN_ENEMY_SPAWNED;
+ }
if(fixed_point_ne(inertia_mod.x, self->base.inertia.x)) {
self->base.inertia.x = fixed_point_neg(self->base.inertia.x);
if(fixed_point_ne(inertia_mod.x, self->base.inertia.x)) {
self->base.inertia.x = fixed_point_neg(self->base.inertia.x);
This page took
0.025004 seconds
and
4
git commands to generate.