From dcc742a7e6d5ca697a4d4bc0f4dbf29cb669b9d4 Mon Sep 17 00:00:00 2001 From: allen Date: Thu, 12 Jun 2014 21:47:37 +0000 Subject: [PATCH] Updated the blinking halos during gameplay. They are definitely correct now and no blenders are involved. (Up for debate however is if 'correct' ever looked good enough.) --- deploy/DATA/gameplay/dmx/2P_lowh_0.tga | Bin 46098 -> 1666 bytes deploy/DATA/gameplay/dmx/2P_lowh_1.tga | Bin 46098 -> 1666 bytes deploy/DMX.exe | Bin 203776 -> 204288 bytes src/source/render_dmx.cpp | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/DATA/gameplay/dmx/2P_lowh_0.tga b/deploy/DATA/gameplay/dmx/2P_lowh_0.tga index a66f796eab0b2558f1740b193346510fa0ad41a5..7a1bdfd592c833b538517dd187880081dac76745 100644 GIT binary patch literal 1666 zcmcJOF-yZx6osFwzrZzPH-Cb&Kf%?}(b4H4A%q|ybSm0Gf`fyINRbXwL~t*`Rd5ss ze}Tkv9{0*6w5EArX-S%U&-vax@5Q-or=Pv8UAN=f7GL}pa{aISNBH~wi$r#N_0{`6p$D3czk@z|v2YK2bXTno38OI z#E;o8DN zl?y9Y*9fmNbCEX%FEeu~kJ&NDSe>5biQ$dGslh7@FJ&F`O@tS#D`mb*!#fA(8oV>Z z%Y|19FGi=CJQ!9D#ywcfRL@8utUHtA5Y5u~&*A$Fe`cuu;fx}?C-@KPZQ$_^FXp3O z;atG$m22&(x6tz4}&-DATW;r z{?6mZQxI5+z_^1tPj!1dTkCUHkD$-FWbRV?&NzJ#z~4Uhk+;|`foKPH8tS$_pH6M- zaipztR%bn#yWPrU!HLw5Qrc!&pt^g|2eeGJL#F4oBsQ)8Ohm*Dq_sF2;i@L z7V$lKtqR=3yfv2T)0}SCr)PAAmT7CHs_wTE7EkwJO3ru0UvXJ`YPInaVs@3z6s|sCFe@;cPYn9PpuyO#RdH-J+B>|hF0}1+;U24(i(O zDNpr#?Wc{u8LTg@^!MPee5dsj>+jACHJpD95&K?apQKDr8Cr9?jM$y6jG5n^3@eP- zP5iBKRzI7eLRf>JK!i=!nDv%fCo@XLrt!=hKQPv z8#B%(QnHO}5woo2PKJ5oT#FbPetjY#TK+NHyI^IUzn?SX)?JHOe}2~@R*1h5 uwZxe13HU$%d%BY>YhP*17(t*XEB)_+zY(>>m=J&f1Rwwb2tZ&D1bzX960_p~ diff --git a/deploy/DATA/gameplay/dmx/2P_lowh_1.tga b/deploy/DATA/gameplay/dmx/2P_lowh_1.tga index a5548d54eac74f0e611271c0f8b85060b6f018bd..b53d0aa599387a8172a34b59918c2bd004925daa 100644 GIT binary patch literal 1666 zcmcJOu}Z^G6o#*>PtdhvHXp(F@e!OZ8bSyXLc0|0Ai=?*h)9tRQbces!Bub+2cJOV z|6k65LugHN!P1g6=luV7&wp>6J9PRvJ~(nC*S7fLx0dUF-9N$KpNyu;>;7L!-Jg$N z{WN*kzFp6koqm6neEUTbW}&vPz7YM{>3FG3dZflA^k2-ir{18>c~l$r3|gKyp7Xx?#%M#HqP>Im&zkH9Ib3JR POtfL$c*fdVu6q9q`Xs86 literal 46098 zcmeI1!BOil5QYO)(&KpC_^3E*KTnVnJAv$nkQTK?X6=IIGr zl0WU2KjIw@kB94@=ZB}m@%j(`h5!U0009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV= z5P$##AOHafKmY;|Xinhecp0wd(=s6hAg}-d{9OPdLqMP*0de;2^fg?U^Y?HyoSdm3 z0D&q3_*;dKhau3MK}&-DATW;r z{?6mZQxI5+z_^1tPj!1dTkCUHkD$-FWbRV?&NzJ#z~4Uhk+;|`foKPH8tS$_pH6M- zaipztR%bn#yWPrU!HLw5Qrc!&pt^g|2eeGJL#F4oBsQ)8Ohm*Dq_sF2;i@L z7V$lKtqR=3yfv2T)0}SCr)PAAmT7CHs_wTE7EkwJO3ru0UvXJ`YPInaVs@3z6s|sCFe@;cPYn9PpuyO#RdH-J+B>|hF0}1+;U24(i(O zDNpr#?Wc{u8LTg@^!MPee5dsj>+jACHJpD95&K?apQKDr8Cr9?jM$y6jG5n^3@eP- zP5iBKRzI7eLRf>JK!i=!nDv%fCo@XLrt!=hKQPv z8#B%(QnHO}5woo2PKJ5oT#FbPetjY#TK+NHyI^IUzn?SX)?JHOe}2~@R*1h5 uwZxe13HU$%d%BY>YhP*17(t*XEB)_+zY(>>m=J&f1Rwwb2tZ&D1pWZa0T$2z diff --git a/deploy/DMX.exe b/deploy/DMX.exe index fb718c2792a2da2a3090dd894cc091af34e502ed..fc07e5b0520da0759666cd296e802885a70ab5ad 100644 GIT binary patch delta 9840 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 NP{Ctx3FAH}{{yW3lz;#L diff --git a/src/source/render_dmx.cpp b/src/source/render_dmx.cpp index 31a8f13..8be1273 100644 --- a/src/source/render_dmx.cpp +++ b/src/source/render_dmx.cpp @@ -417,7 +417,7 @@ void renderUnderFrameDMX() { int blink = gs.player[0].stepZoneBlinkTimer > 0 ? 0 : 1; int lv = blink ? gs.player[0].stagesLevels[gs.currentStage] % DOUBLE_MILD : 3; - masked_blit(m_leftSideHalo[lv][0], rm.m_backbuf, 0, 0, 0, 12, 320, 64); // for singles and doubles combine the two into one big halo + masked_blit(m_leftSideHalo[lv][0], rm.m_backbuf, 0, 0, 0, 12, 320, 64); // for singles and doubles, join the two halves of the halo together masked_blit(m_rightSideHalo[lv][0], rm.m_backbuf, 0, 0, 320, 12, 320, 64); masked_blit(m_leftSideHalo[lv][1], rm.m_backbuf, 0, 0, 0, 402, 320, 48); // the bottom halo @@ -429,7 +429,7 @@ void renderUnderFrameDMX() int lvl = blink ? gs.player[0].stagesLevels[gs.currentStage] % DOUBLE_MILD : 3; blink = gs.player[1].stepZoneBlinkTimer > 0 ? 0 : 1; // probably useless int lvr = blink ? gs.player[1].stagesLevels[gs.currentStage] % DOUBLE_MILD : 3; - masked_blit(m_leftSideHalo[lvl][0], rm.m_backbuf, 0, 0, 0, 12, 320, 64); + masked_blit(m_leftSideHalo[lvl][0], rm.m_backbuf, 0, 0, 0, 12, 320, 64); // 1P is the left half, 2P colors the right half masked_blit(m_rightSideHalo[lvr][0], rm.m_backbuf, 0, 0, 320, 12, 320, 64); masked_blit(m_leftSideHalo[lvl][1], rm.m_backbuf, 0, 0, 0, 402, 320, 48);