mirror of
https://github.com/ZDoom/gzdoom.git
synced 2025-01-22 09:22:04 +00:00
0c39b5c66a
but should use the camera position instead to get the correct position for the closest point along the trail. - Fixed: Explosions no longer caused splashes. - Fixed: Copying translations to lower decals had the shade color check wrong. - Fixed: Waggling floors did not move attached geometry. - Cleaned up p_floor.cpp so that related parts of the code are grouped together. SVN r1926 (trunk)
77 lines
1.8 KiB
C++
77 lines
1.8 KiB
C++
/*
|
|
#include "info.h"
|
|
#include "a_pickups.h"
|
|
#include "a_artifacts.h"
|
|
#include "gstrings.h"
|
|
#include "p_local.h"
|
|
#include "s_sound.h"
|
|
#include "thingdef/thingdef.h"
|
|
*/
|
|
|
|
// Tome of power ------------------------------------------------------------
|
|
|
|
class AArtiTomeOfPower : public APowerupGiver
|
|
{
|
|
DECLARE_CLASS (AArtiTomeOfPower, APowerupGiver)
|
|
public:
|
|
bool Use (bool pickup);
|
|
};
|
|
|
|
|
|
IMPLEMENT_CLASS (AArtiTomeOfPower)
|
|
|
|
bool AArtiTomeOfPower::Use (bool pickup)
|
|
{
|
|
if (Owner->player->morphTics && (Owner->player->MorphStyle & MORPH_UNDOBYTOMEOFPOWER))
|
|
{ // Attempt to undo chicken
|
|
if (!P_UndoPlayerMorph (Owner->player, Owner->player, MORPH_UNDOBYTOMEOFPOWER))
|
|
{ // Failed
|
|
if (!(Owner->player->MorphStyle & MORPH_FAILNOTELEFRAG))
|
|
{
|
|
P_DamageMobj (Owner, NULL, NULL, TELEFRAG_DAMAGE, NAME_Telefrag);
|
|
}
|
|
}
|
|
else
|
|
{ // Succeeded
|
|
S_Sound (Owner, CHAN_VOICE, "*evillaugh", 1, ATTN_IDLE);
|
|
}
|
|
return true;
|
|
}
|
|
else
|
|
{
|
|
return Super::Use (pickup);
|
|
}
|
|
}
|
|
|
|
// Time bomb ----------------------------------------------------------------
|
|
|
|
DEFINE_ACTION_FUNCTION(AActor, A_TimeBomb)
|
|
{
|
|
self->z += 32*FRACUNIT;
|
|
self->RenderStyle = STYLE_Add;
|
|
self->alpha = FRACUNIT;
|
|
P_RadiusAttack (self, self->target, 128, 128, self->DamageType, true);
|
|
P_CheckSplash(self, 128<<FRACBITS);
|
|
}
|
|
|
|
class AArtiTimeBomb : public AInventory
|
|
{
|
|
DECLARE_CLASS (AArtiTimeBomb, AInventory)
|
|
public:
|
|
bool Use (bool pickup);
|
|
};
|
|
|
|
|
|
IMPLEMENT_CLASS (AArtiTimeBomb)
|
|
|
|
bool AArtiTimeBomb::Use (bool pickup)
|
|
{
|
|
angle_t angle = Owner->angle >> ANGLETOFINESHIFT;
|
|
AActor *mo = Spawn("ActivatedTimeBomb",
|
|
Owner->x + 24*finecosine[angle],
|
|
Owner->y + 24*finesine[angle],
|
|
Owner->z - Owner->floorclip, ALLOW_REPLACE);
|
|
mo->target = Owner;
|
|
return true;
|
|
}
|
|
|