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

8
src/g_hexen/a_summon.cpp
View file

@ -129,13 +129,13 @@ void A_Summon (AActor *actor)
{
AMinotaurFriend *mo;
mo = Spawn<AMinotaurFriend> (actor->x, actor->y, actor->z);
mo = Spawn<AMinotaurFriend> (actor->x, actor->y, actor->z, ALLOW_REPLACE);
if (mo)
{
if (P_TestMobjLocation(mo) == false || !actor->tracer)
{ // Didn't fit - change back to artifact
mo->Destroy ();
AActor *arti = Spawn<AArtiDarkServant> (actor->x, actor->y, actor->z);
AActor *arti = Spawn<AArtiDarkServant> (actor->x, actor->y, actor->z, ALLOW_REPLACE);
if (arti) arti->flags |= MF_DROPPED;
return;
}
@ -148,7 +148,7 @@ void A_Summon (AActor *actor)
else
{
mo->tracer = actor->tracer; // Pointer to master
AInventory *power = Spawn<APowerMinotaur> (0, 0, 0);
AInventory *power = Spawn<APowerMinotaur> (0, 0, 0, NO_REPLACE);
power->TryPickup (actor->tracer);
if (actor->tracer->player != NULL)
{
@ -157,7 +157,7 @@ void A_Summon (AActor *actor)
}
// Make smoke puff
Spawn<AMinotaurSmoke> (actor->x, actor->y, actor->z);
Spawn<AMinotaurSmoke> (actor->x, actor->y, actor->z, ALLOW_REPLACE);
S_SoundID (actor, CHAN_VOICE, mo->ActiveSound, 1, ATTN_NORM);
}
}