OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r258 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2006-07-16 09:10:45 +00:00
commit ecce60e8f9
90 changed files with 326 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/d_dehacked.cpp
View file

@ -2595,7 +2595,7 @@ void A_SpawnDehackedPickup (AActor *actor)
{
if ((size_t)actor->health < DehackedPickups.Size())
{
AActor *real = Spawn (DehackedPickups[actor->health], actor->x, actor->y, actor->z);
AActor *real = Spawn (DehackedPickups[actor->health], actor->x, actor->y, actor->z, NO_REPLACE);
if (real != NULL)
{
// Copy properties from the original item to the dehacked pickup it spawns
@ -2621,7 +2621,7 @@ bool ADehackedPickup::TryPickup (AActor *toucher)
{
return false;
}
RealPickup = static_cast<AInventory *>(Spawn (type, x, y, z));
RealPickup = static_cast<AInventory *>(Spawn (type, x, y, z, NO_REPLACE));
if (RealPickup != NULL)
{
if (!(flags & MF_DROPPED))