OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Finally implemented code to keep some or all of your inventory intact when

Browse source 
respawning in coop. Now the new inventory code should finally be complete. :-)
- Fixed: PROP_Inventory_PickupMessage was improperly defined for non-VC++
  compilation.


SVN r197 (trunk)
This commit is contained in:
Randy Heit 2006-06-18 04:10:47 +00:00
commit c87e2252ed
16 changed files with 231 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/p_mobj.cpp
View file

@ -677,6 +677,20 @@ void AActor::RemoveInventory (AInventory *item)
}
}
//============================================================================
//
// AActor :: DestroyAllInventory
//
//============================================================================
void AActor::DestroyAllInventory ()
{
while (Inventory != NULL)
{
Inventory->Destroy ();
}
}
//============================================================================
//
// AActor :: FirstInv
@ -3203,12 +3217,7 @@ void AActor::Deactivate (AActor *activator)
void AActor::Destroy ()
{
// [RH] Destroy any inventory this actor is carrying
while (Inventory != NULL)
{
AInventory *item = Inventory;
Inventory = item->Inventory;
item->Destroy ();
}
DestroyAllInventory ();
// [RH] Unlink from tid chain
RemoveFromHash ();
@ -3220,7 +3229,7 @@ void AActor::Destroy ()
// Delete all nodes on the current sector_list phares 3/16/98
P_DelSector_List();
// stop any playing sound
// Transform any playing sound into positioned, non-actor sounds.
S_RelinkSound (this, NULL);
Super::Destroy ();
@ -3425,24 +3434,18 @@ void P_SpawnPlayer (mapthing2_t *mthing, bool startenterscripts)
P_SetupPsprites (p);
}
// give all cards in death match mode
if (deathmatch)
{
for (unsigned int i = 0; i < PClass::m_Types.Size(); ++i)
{
if (PClass::m_Types[i]->IsDescendantOf (RUNTIME_CLASS(AKey)))
{
AKey *key = (AKey *)GetDefaultByType (PClass::m_Types[i]);
if (key->KeyNumber != 0)
{
key = static_cast<AKey *>(Spawn (PClass::m_Types[i], 0,0,0));
if (!key->TryPickup (p->mo))
{
key->Destroy ();
}
}
}
}
{ // Give all cards in death match mode.
p->mo->GiveDeathmatchInventory ();
}
else if (multiplayer && state == PST_REBORN && oldactor != NULL)
{ // Special inventory handling for respawning in coop
p->mo->FilterCoopRespawnInventory (oldactor);
}
if (oldactor != NULL)
{ // Remove any inventory left from the old actor. Coop handles
// it above, but the other modes don't.
oldactor->DestroyAllInventory();
}
if (StatusBar != NULL && (playernum == consoleplayer || StatusBar->GetPlayer() == playernum))