mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-13 20:44:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added and implemented TrailType enum (#5059)

Browse Source 
* added TrailType enum

* fixed build, moved declaration

* added enhancement comment

* Apply suggestions from code review

---------

Co-authored-by: link5669 <acqmiles@gmail.com>
This commit is contained in:
Miles Acquaviva
2025-02-17 20:03:55 -05:00
committed by GitHub
parent 489cd84faa
commit cc25c96385
7 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_eff_blure.c
+9 -9
View File
@@ -206,8 +206,8 @@ s32 EffectBlure_Update(void* thisx) {
static u8 changed = 0;
u8 reset = 0;
switch (this->trailType) { //there HAS to be a better way to do this.
case 2:
switch (this->trailType) {
case TRAIL_TYPE_BOOMERANG:
if (CVarGetInteger(CVAR_COSMETIC("Trails.Boomerang.Changed"), 0)) {
color = CVarGetColor(CVAR_COSMETIC("Trails.Boomerang.Value"), (Color_RGBA8){ 255, 255, 100, 255 });
changed = 1;
@@ -216,7 +216,7 @@ s32 EffectBlure_Update(void* thisx) {
reset = 1;
}
break;
case 3:
case TRAIL_TYPE_BOMBCHU:
if (CVarGetInteger(CVAR_COSMETIC("Trails.Bombchu.Changed"), 0)) {
color = CVarGetColor(CVAR_COSMETIC("Trails.Bombchu.Value"), (Color_RGBA8){ 250, 0, 0, 255 });
this->p1StartColor.r = color.r;
@@ -247,7 +247,7 @@ s32 EffectBlure_Update(void* thisx) {
this->p2EndColor.b = color.b * 0.4f;
}
break;
case 4:
case TRAIL_TYPE_KOKIRI_SWORD:
if (CVarGetInteger(CVAR_COSMETIC("Trails.KokiriSword.Changed"), 0)) {
color = CVarGetColor(CVAR_COSMETIC("Trails.KokiriSword.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
changed = 1;
@@ -256,7 +256,7 @@ s32 EffectBlure_Update(void* thisx) {
reset = 1;
}
break;
case 5:
case TRAIL_TYPE_MASTER_SWORD:
if (CVarGetInteger(CVAR_COSMETIC("Trails.MasterSword.Changed"), 0)) {
color = CVarGetColor(CVAR_COSMETIC("Trails.MasterSword.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
changed = 1;
@@ -265,7 +265,7 @@ s32 EffectBlure_Update(void* thisx) {
reset = 1;
}
break;
case 6:
case TRAIL_TYPE_BIGGORON_SWORD:
if (CVarGetInteger(CVAR_COSMETIC("Trails.BiggoronSword.Changed"), 0)) {
color = CVarGetColor(CVAR_COSMETIC("Trails.BiggoronSword.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
changed = 1;
@@ -274,7 +274,7 @@ s32 EffectBlure_Update(void* thisx) {
reset = 1;
}
break;
case 7:
case TRAIL_TYPE_STICK:
if (CVarGetInteger(CVAR_COSMETIC("Trails.Stick.Changed"), 0)) {
color = CVarGetColor(CVAR_COSMETIC("Trails.Stick.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
changed = 1;
@@ -283,7 +283,7 @@ s32 EffectBlure_Update(void* thisx) {
reset = 1;
}
break;
case 8:
case TRAIL_TYPE_HAMMER:
if (CVarGetInteger(CVAR_COSMETIC("Trails.Hammer.Changed"), 0)) {
color = CVarGetColor(CVAR_COSMETIC("Trails.Hammer.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
changed = 1;
@@ -316,7 +316,7 @@ s32 EffectBlure_Update(void* thisx) {
}
// Don't override boomerang and bombchu trail durations
if (this->trailType != 2 && this->trailType != 3) {
if (this->trailType != TRAIL_TYPE_BOOMERANG && this->trailType != TRAIL_TYPE_BOMBCHU) {
if (CVarGetInteger(CVAR_COSMETIC("Trails.Duration.Changed"), 0)) {
this->elemDuration = CVarGetInteger(CVAR_COSMETIC("Trails.Duration.Value"), 4);
}