- Added customizable pickup flash.

- Added option to show shorter messages for save game and screenshot confirmation.
  Also added this to the 'Messages' menu.


SVN r749 (trunk)
This commit is contained in:
Christoph Oelckers 2008-02-16 10:23:12 +00:00
commit e99b239ae6
19 changed files with 132 additions and 32 deletions

View file

@ -587,18 +587,18 @@ bool AInventory::GoAway ()
// Dropped items never stick around
if (flags & MF_DROPPED)
{
if (ItemFlags & IF_PICKUPFLASH)
if (PickupFlash != NULL)
{
Spawn<APickupFlash> (x, y, z, ALLOW_REPLACE);
Spawn(PickupFlash, x, y, z, ALLOW_REPLACE);
}
return false;
}
if (!ShouldStay ())
{
if (ItemFlags & IF_PICKUPFLASH)
if (PickupFlash != NULL)
{
Spawn<APickupFlash> (x, y, z, ALLOW_REPLACE);
Spawn(PickupFlash, x, y, z, ALLOW_REPLACE);
}
Hide ();
if (ShouldRespawn ())
@ -857,7 +857,7 @@ void AInventory::Hide ()
{
SetState (&States[S_HIDESPECIAL]);
tics = 1400;
if (ItemFlags & IF_PICKUPFLASH) tics += 30;
if (PickupFlash != NULL) tics += 30;
}
else
{