TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use helper to diminish palette color toward zero

Browse source
This commit is contained in:
Kp 2013-11-10 22:13:50 +00:00
parent e30f548d60
commit ee5fbe1467
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
similar/main/game.cpp
View file

@ -624,6 +624,21 @@ void PALETTE_FLASH_ADD(int _dr, int _dg, int _db)
PaletteBlueAdd = -maxval;
}
static void diminish_palette_color_toward_zero(int& palette_color_add, const int& dec_amount)
{
if (palette_color_add > 0 ) {
if (palette_color_add < dec_amount)
palette_color_add = 0;
else
palette_color_add -= dec_amount;
} else if (palette_color_add < 0 ) {
if (palette_color_add > -dec_amount )
palette_color_add = 0;
else
palette_color_add += dec_amount;
}
}
// ------------------------------------------------------------------------------------
// Diminish palette effects towards normal.
static void diminish_palette_towards_normal(void)
@ -684,14 +699,9 @@ static void diminish_palette_towards_normal(void)
}
#endif
if (PaletteRedAdd > 0 ) { PaletteRedAdd -= dec_amount; if (PaletteRedAdd < 0 ) PaletteRedAdd = 0; }
if (PaletteRedAdd < 0 ) { PaletteRedAdd += dec_amount; if (PaletteRedAdd > 0 ) PaletteRedAdd = 0; }
if (PaletteGreenAdd > 0 ) { PaletteGreenAdd -= dec_amount; if (PaletteGreenAdd < 0 ) PaletteGreenAdd = 0; }
if (PaletteGreenAdd < 0 ) { PaletteGreenAdd += dec_amount; if (PaletteGreenAdd > 0 ) PaletteGreenAdd = 0; }
if (PaletteBlueAdd > 0 ) { PaletteBlueAdd -= dec_amount; if (PaletteBlueAdd < 0 ) PaletteBlueAdd = 0; }
if (PaletteBlueAdd < 0 ) { PaletteBlueAdd += dec_amount; if (PaletteBlueAdd > 0 ) PaletteBlueAdd = 0; }
diminish_palette_color_toward_zero(PaletteRedAdd, dec_amount);
diminish_palette_color_toward_zero(PaletteGreenAdd, dec_amount);
diminish_palette_color_toward_zero(PaletteBlueAdd, dec_amount);
if ( (Newdemo_state==ND_STATE_RECORDING) && (PaletteRedAdd || PaletteGreenAdd || PaletteBlueAdd) )
newdemo_record_palette_effect(PaletteRedAdd, PaletteGreenAdd, PaletteBlueAdd);