mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-25 10:02:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into asset-extraction

Browse Source
This commit is contained in:
octorock
2021-11-12 12:13:13 +01:00
parent b1e2175ffb
commit 9396484df6
340 changed files with 4576 additions and 6192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/projectileInit.c
+6 -6
View File
@@ -26,19 +26,19 @@ bool32 ProjectileInit(Entity* this) {
this->flags |= 0x80;
}
this->spriteIndex = definition->spriteIndex;
if (this->spriteSettings.b.draw == 0) {
this->spriteSettings.b.draw = definition->spriteFlags.draw;
if (this->spriteSettings.draw == 0) {
this->spriteSettings.draw = definition->spriteFlags.draw;
}
this->spritePriority.b1 = definition->spriteFlags.spritePriority;
this->spriteSettings.b.shadow = definition->spriteFlags.shadow;
this->spriteSettings.shadow = definition->spriteFlags.shadow;
if (this->speed == 0) {
this->speed = definition->speed;
}
this->field_0x3c = (definition->field0x3c << 4) | 7;
this->flags2 = definition->flags2;
this->damageType = definition->damageType;
this->field_0x40 = definition->field0x40;
this->currentHealth = 0xff;
this->hitType = definition->damageType;
this->hurtType = definition->field0x40;
this->health = 0xff;
this->hitbox = (Hitbox*)definition->ptr.hitbox;
UpdateSpriteForCollisionLayer(this);
}