- Fixed: Information added with addkeysection and addmenukey was never freed.
- Fixed: A classic decorate FakeInventory's PickupText was never freed. - Fixed: Colored lights were never freed. - Fixed: When a dehacked patch was applied, the dehacked StateMap was never freed. - Removed termdone checks around atterm(S_ClearSoundData) and atterm(S_Shutdown) because atterm() already checks for duplicates. - Fixed: S_ClearSoundData() should unload all sounds before it clears S_sfx. - Fixed: AltSoundRenderer::LoadSound() didn't check if the sound had already been loaded and lost the old sound data if it had been. - Fixed: FinishDehPatch() needlessly duplicated the new DehackedPickup's name. - Fixed: PatchStrings() allocated a private string and never freed it. SVN r183 (trunk)
This commit is contained in:
parent
9655ee9843
commit
5859aa7194
9 changed files with 101 additions and 47 deletions
|
|
@ -103,16 +103,16 @@ class AFakeInventory : public AInventory
|
|||
{
|
||||
DECLARE_STATELESS_ACTOR (AFakeInventory, AInventory);
|
||||
public:
|
||||
char *PickupText;
|
||||
bool Respawnable;
|
||||
|
||||
const char *PickupMessage ()
|
||||
{
|
||||
if (PickupText == 0)
|
||||
const char *text = GetClass()->Meta.GetMetaString (AIMETA_PickupMessage);
|
||||
if (text == 0)
|
||||
{
|
||||
return Super::PickupMessage();
|
||||
}
|
||||
return PickupText;
|
||||
return text;
|
||||
}
|
||||
|
||||
bool ShouldRespawn ()
|
||||
|
|
@ -860,7 +860,7 @@ static void ParseInsideDecoration (FActorInfo *info, AActor *defaults,
|
|||
else if (def == DEF_Pickup && SC_Compare ("PickupMessage"))
|
||||
{
|
||||
SC_MustGetString ();
|
||||
inv->PickupText = copystring (sc_String);
|
||||
info->Class->Meta.SetMetaString(AIMETA_PickupMessage, sc_String);
|
||||
}
|
||||
else if (def == DEF_Pickup && SC_Compare ("Respawns"))
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue