- Fixed: The skin loader assumed that all skin textures are in Doom patch

format. Now it calls FTexture::CreateTexture to do proper checks.
- Removed the PickupSound method from FakeInventory and changed it so that
  it uses AInventory::PickupSound to store its custom pickup sound.
- Removed the PickupMessage method from FakeInventory. This can be handled
  by the standard pickup message code now that it uses the meta data for the
  message.
- Fixed: The maximum indices for StrifeTypes were inconsistent. Now the
  allowed range is 0-1000 in all situations.
- Fixed: Setting a local SNDINFO for a map deleted all skin based sounds.
- Added a crouchsprite property to the skin info.
- Fixed: Crouching sprites must be checked each frame, not just each tic.
- Added an srand call to D_DoomMain in order to randomize the values returned
  by rand which is being used to shuffle the playlist.


SVN r185 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-11 11:28:48 +00:00
commit bb5a44fc90
14 changed files with 228 additions and 103 deletions

View file

@ -105,16 +105,6 @@ class AFakeInventory : public AInventory
public:
bool Respawnable;
const char *PickupMessage ()
{
const char *text = GetClass()->Meta.GetMetaString (AIMETA_PickupMessage);
if (text == 0)
{
return Super::PickupMessage();
}
return text;
}
bool ShouldRespawn ()
{
return Respawnable && Super::ShouldRespawn();
@ -137,18 +127,6 @@ public:
{
// The special was already executed by TryPickup, so do nothing here
}
void PlayPickupSound (AActor *toucher)
{
if (AttackSound != 0)
{
S_SoundID (toucher, CHAN_PICKUP, AttackSound, 1, ATTN_NORM);
}
else
{
Super::PlayPickupSound (toucher);
}
}
};
IMPLEMENT_STATELESS_ACTOR (AFakeInventory, Any, -1, 0)
PROP_Flags (MF_SPECIAL)
@ -855,7 +833,7 @@ static void ParseInsideDecoration (FActorInfo *info, AActor *defaults,
else if (def == DEF_Pickup && SC_Compare ("PickupSound"))
{
SC_MustGetString ();
inv->AttackSound = S_FindSound (sc_String);
inv->PickupSound = S_FindSound (sc_String);
}
else if (def == DEF_Pickup && SC_Compare ("PickupMessage"))
{