diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-12 12:13:13 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-12 12:13:13 +0100 |
| commit | 9396484df6c05886b38fd29bc67b4d247f15015f (patch) | |
| tree | 23191aa4cccdfb0889ae935f96231be70a0f1bda /src/projectile/windProjectile.c | |
| parent | b1e2175ffb7f4b65dffb5480e08c86135c66c109 (diff) | |
Merge branch 'master' into asset-extraction
Diffstat (limited to 'src/projectile/windProjectile.c')
| -rw-r--r-- | src/projectile/windProjectile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/projectile/windProjectile.c b/src/projectile/windProjectile.c index db9ff9b6..ff77862f 100644 --- a/src/projectile/windProjectile.c +++ b/src/projectile/windProjectile.c @@ -36,7 +36,7 @@ void WindProjectile_Action1(Entity* this) { if (parent->next == NULL) { DeleteEntity(this); } else { - if (this->spriteSettings.b.draw == 1) { + if (this->spriteSettings.draw == 1) { CopyPosition(parent, this); direction = (parent->direction + 4) & 0x18; if (this->actionDelay != 0) { @@ -67,14 +67,14 @@ void WindProjectile_Action2(Entity* this) { } } else { this->action = 3; - this->flags &= 0x7f; + COLLISION_OFF(this); this->speed = 0; } } void WindProjectile_Action3(Entity* this) { GetNextFrame(this); - if ((this->frames.all & 0x80) != 0) { + if ((this->frame & 0x80) != 0) { DeleteEntity(this); } } |
