From ac8796cbc9e4aab47fe1bcde2baa78b04c51683f Mon Sep 17 00:00:00 2001 From: Roman971 <32455037+Roman971@users.noreply.github.com> Date: Sat, 15 Aug 2020 20:04:27 +0200 Subject: Fix _DW with permuter and GeometryMode macros (#323) --- src/code/z_eff_shield_particle.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/code') diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 855161765..efdc19eec 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -169,8 +169,7 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { gDPLoadTextureBlock(gfxCtx->polyXlu.p++, D_04038FB0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - if (1) {} // Both necessary to match - if (1) {} + if (1) {} // Necessary to match gDPSetCombineLERP(gfxCtx->polyXlu.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); @@ -179,8 +178,6 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); gSPSetGeometryMode(gfxCtx->polyXlu.p++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - if (1) {} // Also necessary to match - EffectShieldParticle_GetColors(this, &primColor, &envColor); gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, primColor.r, primColor.g, primColor.b, primColor.a); -- cgit v1.2.3