2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
//**************************************************************************
|
|
|
|
//**
|
|
|
|
//** p_pspr.c : Heretic 2 : Raven Software, Corp.
|
|
|
|
//**
|
|
|
|
//** $RCSfile: p_pspr.c,v $
|
|
|
|
//** $Revision: 1.105 $
|
|
|
|
//** $Date: 96/01/06 03:23:35 $
|
|
|
|
//** $Author: bgokey $
|
|
|
|
//**
|
|
|
|
//**************************************************************************
|
|
|
|
|
|
|
|
// HEADER FILES ------------------------------------------------------------
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
#include "doomdef.h"
|
|
|
|
#include "d_event.h"
|
|
|
|
#include "c_cvars.h"
|
|
|
|
#include "m_random.h"
|
|
|
|
#include "p_local.h"
|
|
|
|
#include "s_sound.h"
|
|
|
|
#include "doomstat.h"
|
|
|
|
#include "gi.h"
|
|
|
|
#include "p_pspr.h"
|
|
|
|
#include "p_effect.h"
|
|
|
|
#include "a_doomglobal.h"
|
|
|
|
#include "templates.h"
|
2007-05-28 14:46:49 +00:00
|
|
|
#include "thingdef/thingdef.h"
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// MACROS ------------------------------------------------------------------
|
|
|
|
|
|
|
|
#define LOWERSPEED FRACUNIT*6
|
|
|
|
#define RAISESPEED FRACUNIT*6
|
|
|
|
|
|
|
|
// TYPES -------------------------------------------------------------------
|
|
|
|
|
|
|
|
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
|
|
|
|
|
|
|
|
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
|
|
|
|
|
|
|
|
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
|
|
|
|
|
|
|
|
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
|
|
|
|
|
|
|
|
// PUBLIC DATA DEFINITIONS -------------------------------------------------
|
|
|
|
|
|
|
|
// [SO] 1=Weapons states are all 1 tick
|
|
|
|
// 2=states with a function 1 tick, others 0 ticks.
|
|
|
|
CVAR(Int, sv_fastweapons, false, CVAR_SERVERINFO);
|
|
|
|
|
|
|
|
// PRIVATE DATA DEFINITIONS ------------------------------------------------
|
|
|
|
|
|
|
|
static FRandom pr_wpnreadysnd ("WpnReadySnd");
|
|
|
|
static FRandom pr_gunshot ("GunShot");
|
|
|
|
|
|
|
|
// CODE --------------------------------------------------------------------
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_SetPsprite
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_SetPsprite (player_t *player, int position, FState *state)
|
|
|
|
{
|
|
|
|
pspdef_t *psp;
|
|
|
|
|
|
|
|
if (position == ps_weapon)
|
|
|
|
{
|
|
|
|
// A_WeaponReady will re-set this as needed
|
|
|
|
player->cheats &= ~CF_WEAPONREADY;
|
|
|
|
}
|
|
|
|
|
|
|
|
psp = &player->psprites[position];
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (state == NULL)
|
|
|
|
{ // Object removed itself.
|
|
|
|
psp->state = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
psp->state = state;
|
|
|
|
|
|
|
|
if (sv_fastweapons >= 2 && position == ps_weapon)
|
|
|
|
psp->tics = (state->Action == NULL) ? 0 : 1;
|
|
|
|
else if (sv_fastweapons)
|
|
|
|
psp->tics = 1; // great for producing decals :)
|
|
|
|
else
|
|
|
|
psp->tics = state->GetTics(); // could be 0
|
|
|
|
|
2006-10-29 11:01:00 +00:00
|
|
|
if (state->GetMisc1())
|
|
|
|
{ // Set coordinates.
|
|
|
|
psp->sx = state->GetMisc1()<<FRACBITS;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-10-29 11:01:00 +00:00
|
|
|
if (state->GetMisc2())
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-10-29 11:01:00 +00:00
|
|
|
psp->sy = state->GetMisc2()<<FRACBITS;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-10-29 11:01:00 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
if (state->GetAction())
|
|
|
|
{
|
|
|
|
// The parameterized action functions need access to the current state and
|
|
|
|
// if a function is supposed to work with both actors and weapons
|
|
|
|
// there is no real means to get to it reliably so I store it in a global variable here.
|
|
|
|
// Yes, I know this is truly awful but it is the only method I can think of
|
|
|
|
// that does not involve changing stuff throughout the code.
|
|
|
|
// Of course this should be rewritten ASAP.
|
- Fixed: ActorFlagSetOrReset() wasn't receiving the + or - character from
ParseActorProperties().
- Fixed: The decorate FindFlag() function returned flags from ActorFlags
instead of the passed flags set.
- Fixed: The CHT_CHAINSAW, CHT_POWER, CHT_HEALTH, and CHT_RESSURECT needed
NULL player->mo checks.
- Fixed: The "give all" command didn't give the backpack in Doom, and it
must give the backpack before giving ammo.
- Fixed: P_SetPsprite() must not call the action function if the player is
not attached to an actor. This can happen, for instance, if the level is
destroyed while the player is holding a powered-up Phoenix Rod. As part
of its EndPowerup() function, it sets the psprite to the regular version,
but the player actor has already been destroyed.
- Fixed: FinishThingdef() needs to check for valid names, because weapons
could have inherited valid pointers from their superclass.
- Fixed: fuglyname didn't work.
- Fixed: Redefining $ambient sounds leaked memory.
- Added Jim's crashcatcher.c fix for better shell support.
- VC7.1 seems to have no trouble distinguishing between passing a (const
TypeInfo *) reference to operator<< and the generic, templated (object *)
version, so a few places that can benefit from it now use it. I believe
VC6 had problems with this, which is why I didn't do it all along. The
function's implementation was also moved out of dobject.cpp and into
farchive.cpp.
- Fixed: UnpackPixels() unpacked all chunks in a byte, which is wrong for the
last byte in a row if the image width is not an even multiple of the number
pixels per byte.
- Fixed: P_TranslateLineDef() should only clear monster activation for secret
useable lines, not crossable lines.
- Fixed: Some leftover P_IsHostile() calls still needed to be rewritten.
- Fixed: AWeaponHolder::Serialize() wrote the class type in all circumstances.
SVN r20 (trunk)
2006-03-14 06:11:39 +00:00
|
|
|
CallingState = state;
|
2006-02-24 04:48:15 +00:00
|
|
|
// Call action routine.
|
- Fixed: ActorFlagSetOrReset() wasn't receiving the + or - character from
ParseActorProperties().
- Fixed: The decorate FindFlag() function returned flags from ActorFlags
instead of the passed flags set.
- Fixed: The CHT_CHAINSAW, CHT_POWER, CHT_HEALTH, and CHT_RESSURECT needed
NULL player->mo checks.
- Fixed: The "give all" command didn't give the backpack in Doom, and it
must give the backpack before giving ammo.
- Fixed: P_SetPsprite() must not call the action function if the player is
not attached to an actor. This can happen, for instance, if the level is
destroyed while the player is holding a powered-up Phoenix Rod. As part
of its EndPowerup() function, it sets the psprite to the regular version,
but the player actor has already been destroyed.
- Fixed: FinishThingdef() needs to check for valid names, because weapons
could have inherited valid pointers from their superclass.
- Fixed: fuglyname didn't work.
- Fixed: Redefining $ambient sounds leaked memory.
- Added Jim's crashcatcher.c fix for better shell support.
- VC7.1 seems to have no trouble distinguishing between passing a (const
TypeInfo *) reference to operator<< and the generic, templated (object *)
version, so a few places that can benefit from it now use it. I believe
VC6 had problems with this, which is why I didn't do it all along. The
function's implementation was also moved out of dobject.cpp and into
farchive.cpp.
- Fixed: UnpackPixels() unpacked all chunks in a byte, which is wrong for the
last byte in a row if the image width is not an even multiple of the number
pixels per byte.
- Fixed: P_TranslateLineDef() should only clear monster activation for secret
useable lines, not crossable lines.
- Fixed: Some leftover P_IsHostile() calls still needed to be rewritten.
- Fixed: AWeaponHolder::Serialize() wrote the class type in all circumstances.
SVN r20 (trunk)
2006-03-14 06:11:39 +00:00
|
|
|
if (player->mo != NULL)
|
|
|
|
{
|
|
|
|
state->GetAction() (player->mo);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
if (!psp->state)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
state = psp->state->GetNextState();
|
|
|
|
} while (!psp->tics); // An initial state of 0 could cycle through.
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_SetPspriteNF
|
|
|
|
//
|
|
|
|
// Identical to P_SetPsprite, without calling the action function
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_SetPspriteNF (player_t *player, int position, FState *state)
|
|
|
|
{
|
|
|
|
pspdef_t *psp;
|
|
|
|
|
|
|
|
psp = &player->psprites[position];
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (state == NULL)
|
|
|
|
{ // Object removed itself.
|
|
|
|
psp->state = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
psp->state = state;
|
|
|
|
psp->tics = state->GetTics(); // could be 0
|
|
|
|
|
2006-10-29 11:01:00 +00:00
|
|
|
if (state->GetMisc1())
|
|
|
|
{ // Set coordinates.
|
|
|
|
psp->sx = state->GetMisc1()<<FRACBITS;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-10-29 11:01:00 +00:00
|
|
|
if (state->GetMisc2())
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-10-29 11:01:00 +00:00
|
|
|
psp->sy = state->GetMisc2()<<FRACBITS;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
state = psp->state->GetNextState();
|
|
|
|
} while (!psp->tics); // An initial state of 0 could cycle through.
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_BringUpWeapon
|
|
|
|
//
|
|
|
|
// Starts bringing the pending weapon up from the bottom of the screen.
|
|
|
|
// This is only called to start the rising, not throughout it.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_BringUpWeapon (player_t *player)
|
|
|
|
{
|
|
|
|
FState *newstate;
|
|
|
|
AWeapon *weapon;
|
|
|
|
|
|
|
|
if (player->PendingWeapon == WP_NOCHANGE)
|
|
|
|
{
|
|
|
|
player->psprites[ps_weapon].sy = WEAPONTOP;
|
|
|
|
P_SetPsprite (player, ps_weapon, player->ReadyWeapon->GetReadyState());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
weapon = player->PendingWeapon;
|
|
|
|
|
|
|
|
// If the player has a tome of power, use this weapon's powered up
|
|
|
|
// version, if one is available.
|
|
|
|
if (weapon != NULL &&
|
|
|
|
weapon->SisterWeapon &&
|
|
|
|
weapon->SisterWeapon->WeaponFlags & WIF_POWERED_UP &&
|
|
|
|
player->mo->FindInventory (RUNTIME_CLASS(APowerWeaponLevel2)))
|
|
|
|
{
|
|
|
|
weapon = weapon->SisterWeapon;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (weapon != NULL)
|
|
|
|
{
|
|
|
|
if (weapon->UpSound)
|
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (player->mo, CHAN_WEAPON, weapon->UpSound, 1, ATTN_NORM);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
newstate = weapon->GetUpState ();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
newstate = NULL;
|
|
|
|
}
|
|
|
|
player->PendingWeapon = WP_NOCHANGE;
|
|
|
|
player->ReadyWeapon = weapon;
|
|
|
|
player->psprites[ps_weapon].sy = player->cheats & CF_INSTANTWEAPSWITCH
|
|
|
|
? WEAPONTOP : WEAPONBOTTOM;
|
|
|
|
P_SetPsprite (player, ps_weapon, newstate);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_FireWeapon
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_FireWeapon (player_t *player)
|
|
|
|
{
|
|
|
|
AWeapon *weapon;
|
|
|
|
|
|
|
|
// [SO] 9/2/02: People were able to do an awful lot of damage
|
|
|
|
// when they were observers...
|
|
|
|
if (!player->isbot && bot_observer)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
weapon = player->ReadyWeapon;
|
|
|
|
if (weapon == NULL || !weapon->CheckAmmo (AWeapon::PrimaryFire, true))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-07-16 10:23:14 +00:00
|
|
|
player->mo->PlayAttacking ();
|
2006-02-24 04:48:15 +00:00
|
|
|
weapon->bAltFire = false;
|
2006-10-31 14:53:21 +00:00
|
|
|
P_SetPsprite (player, ps_weapon, weapon->GetAtkState(!!player->refire));
|
2006-02-24 04:48:15 +00:00
|
|
|
if (!(weapon->WeaponFlags & WIF_NOALERT))
|
|
|
|
{
|
|
|
|
P_NoiseAlert (player->mo, player->mo, false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_FireWeaponAlt
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_FireWeaponAlt (player_t *player)
|
|
|
|
{
|
|
|
|
AWeapon *weapon;
|
|
|
|
|
|
|
|
// [SO] 9/2/02: People were able to do an awful lot of damage
|
|
|
|
// when they were observers...
|
|
|
|
if (!player->isbot && bot_observer)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
weapon = player->ReadyWeapon;
|
2006-10-31 14:53:21 +00:00
|
|
|
if (weapon == NULL || weapon->FindState(NAME_AltFire) == NULL || !weapon->CheckAmmo (AWeapon::AltFire, true))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-07-16 10:23:14 +00:00
|
|
|
player->mo->PlayAttacking ();
|
2006-02-24 04:48:15 +00:00
|
|
|
weapon->bAltFire = true;
|
2006-10-31 14:53:21 +00:00
|
|
|
|
|
|
|
|
|
|
|
P_SetPsprite (player, ps_weapon, weapon->GetAltAtkState(!!player->refire));
|
2006-02-24 04:48:15 +00:00
|
|
|
if (!(weapon->WeaponFlags & WIF_NOALERT))
|
|
|
|
{
|
|
|
|
P_NoiseAlert (player->mo, player->mo, false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_DropWeapon
|
|
|
|
//
|
|
|
|
// The player died, so put the weapon away.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_DropWeapon (player_t *player)
|
|
|
|
{
|
|
|
|
if (player->ReadyWeapon != NULL)
|
|
|
|
{
|
|
|
|
P_SetPsprite (player, ps_weapon, player->ReadyWeapon->GetDownState());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// P_BobWeapon
|
|
|
|
//
|
|
|
|
// [RH] Moved this out of A_WeaponReady so that the weapon can bob every
|
|
|
|
// tic and not just when A_WeaponReady is called. Not all weapons execute
|
|
|
|
// A_WeaponReady every tic, and it looks bad if they don't bob smoothly.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void P_BobWeapon (player_t *player, pspdef_t *psp, fixed_t *x, fixed_t *y)
|
|
|
|
{
|
|
|
|
static fixed_t curbob;
|
|
|
|
|
|
|
|
AWeapon *weapon;
|
|
|
|
fixed_t bobtarget;
|
|
|
|
|
|
|
|
weapon = player->ReadyWeapon;
|
|
|
|
|
|
|
|
if (weapon == NULL || weapon->WeaponFlags & WIF_DONTBOB)
|
|
|
|
{
|
|
|
|
*x = *y = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Bob the weapon based on movement speed.
|
|
|
|
int angle = (128*35/TICRATE*level.time)&FINEMASK;
|
|
|
|
|
|
|
|
// [RH] Smooth transitions between bobbing and not-bobbing frames.
|
|
|
|
// This also fixes the bug where you can "stick" a weapon off-center by
|
|
|
|
// shooting it when it's at the peak of its swing.
|
|
|
|
bobtarget = (player->cheats & CF_WEAPONREADY) ? player->bob : 0;
|
|
|
|
if (curbob != bobtarget)
|
|
|
|
{
|
|
|
|
if (abs (bobtarget - curbob) <= 1*FRACUNIT)
|
|
|
|
{
|
|
|
|
curbob = bobtarget;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fixed_t zoom = MAX<fixed_t> (1*FRACUNIT, abs (curbob - bobtarget) / 40);
|
|
|
|
if (curbob > bobtarget)
|
|
|
|
{
|
|
|
|
curbob -= zoom;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
curbob += zoom;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (curbob != 0)
|
|
|
|
{
|
|
|
|
*x = FixedMul(player->bob, finecosine[angle]);
|
|
|
|
*y = FixedMul(player->bob, finesine[angle & (FINEANGLES/2-1)]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*x = 0;
|
|
|
|
*y = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC A_WeaponReady
|
|
|
|
//
|
|
|
|
// The player can fire the weapon or change to another weapon at this time.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_WeaponReady)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
player_t *player = self->player;
|
2006-02-24 04:48:15 +00:00
|
|
|
AWeapon *weapon;
|
|
|
|
|
|
|
|
if (NULL == player)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
weapon = player->ReadyWeapon;
|
|
|
|
|
|
|
|
if (NULL == weapon)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Change player from attack state
|
2008-08-10 20:48:55 +00:00
|
|
|
if (self->InStateSequence(self->state, self->MissileState) ||
|
|
|
|
self->InStateSequence(self->state, self->MeleeState))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
static_cast<APlayerPawn *>(self)->PlayIdle ();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Play ready sound, if any.
|
2006-10-31 14:53:21 +00:00
|
|
|
if (weapon->ReadySound && player->psprites[ps_weapon].state == weapon->FindState(NAME_Ready))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (!(weapon->WeaponFlags & WIF_READYSNDHALF) || pr_wpnreadysnd() < 128)
|
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
S_Sound (self, CHAN_WEAPON, weapon->ReadySound, 1, ATTN_NORM);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Prepare for bobbing and firing action.
|
|
|
|
player->cheats |= CF_WEAPONREADY;
|
|
|
|
player->psprites[ps_weapon].sx = 0;
|
|
|
|
player->psprites[ps_weapon].sy = WEAPONTOP;
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_CheckWeaponFire
|
|
|
|
//
|
|
|
|
// The player can fire the weapon or change to another weapon at this time.
|
|
|
|
// [RH] This was in A_WeaponReady before, but that only works well when the
|
|
|
|
// weapon's ready frames have a one tic delay.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_CheckWeaponFire (player_t *player)
|
|
|
|
{
|
|
|
|
AWeapon *weapon = player->ReadyWeapon;
|
|
|
|
|
|
|
|
if (weapon == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Put the weapon away if the player has a pending weapon or has died.
|
|
|
|
if ((player->morphTics == 0 && player->PendingWeapon != WP_NOCHANGE) || player->health <= 0)
|
|
|
|
{
|
|
|
|
P_SetPsprite (player, ps_weapon, weapon->GetDownState());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check for fire. Some weapons do not auto fire.
|
|
|
|
if (player->cmd.ucmd.buttons & BT_ATTACK)
|
|
|
|
{
|
|
|
|
if (!player->attackdown || !(weapon->WeaponFlags & WIF_NOAUTOFIRE))
|
|
|
|
{
|
|
|
|
player->attackdown = true;
|
|
|
|
P_FireWeapon (player);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (player->cmd.ucmd.buttons & BT_ALTATTACK)
|
|
|
|
{
|
|
|
|
if (!player->attackdown || !(weapon->WeaponFlags & WIF_NOAUTOFIRE))
|
|
|
|
{
|
|
|
|
player->attackdown = true;
|
|
|
|
P_FireWeaponAlt (player);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
player->attackdown = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC A_ReFire
|
|
|
|
//
|
|
|
|
// The player can re-fire the weapon without lowering it entirely.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_ReFire)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
player_t *player = self->player;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (NULL == player)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if ((player->cmd.ucmd.buttons&BT_ATTACK)
|
|
|
|
&& !player->ReadyWeapon->bAltFire
|
|
|
|
&& player->PendingWeapon == WP_NOCHANGE && player->health)
|
|
|
|
{
|
|
|
|
player->refire++;
|
|
|
|
P_FireWeapon (player);
|
|
|
|
}
|
|
|
|
else if ((player->cmd.ucmd.buttons&BT_ALTATTACK)
|
|
|
|
&& player->ReadyWeapon->bAltFire
|
|
|
|
&& player->PendingWeapon == WP_NOCHANGE && player->health)
|
|
|
|
{
|
|
|
|
player->refire++;
|
|
|
|
P_FireWeaponAlt (player);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
player->refire = 0;
|
|
|
|
player->ReadyWeapon->CheckAmmo (player->ReadyWeapon->bAltFire
|
|
|
|
? AWeapon::AltFire : AWeapon::PrimaryFire, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_ClearReFire)
|
2008-06-30 23:30:06 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
player_t *player = self->player;
|
2008-06-30 23:30:06 +00:00
|
|
|
|
|
|
|
if (NULL != player)
|
|
|
|
{
|
|
|
|
player->refire = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC A_CheckReload
|
|
|
|
//
|
|
|
|
// Present in Doom, but unused. Also present in Strife, and actually used.
|
|
|
|
// This and what I call A_XBowReFire are actually the same thing in Strife,
|
|
|
|
// not two separate functions as I have them here.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_CheckReload)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
if (self->player != NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
self->player->ReadyWeapon->CheckAmmo (
|
|
|
|
self->player->ReadyWeapon->bAltFire ? AWeapon::AltFire
|
2006-02-24 04:48:15 +00:00
|
|
|
: AWeapon::PrimaryFire, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC A_Lower
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_Lower)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
player_t *player = self->player;
|
2006-02-24 04:48:15 +00:00
|
|
|
pspdef_t *psp;
|
|
|
|
|
|
|
|
if (NULL == player)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
psp = &player->psprites[ps_weapon];
|
|
|
|
if (player->morphTics || player->cheats & CF_INSTANTWEAPSWITCH)
|
|
|
|
{
|
|
|
|
psp->sy = WEAPONBOTTOM;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
psp->sy += LOWERSPEED;
|
|
|
|
}
|
|
|
|
if (psp->sy < WEAPONBOTTOM)
|
|
|
|
{ // Not lowered all the way yet
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (player->playerstate == PST_DEAD)
|
|
|
|
{ // Player is dead, so don't bring up a pending weapon
|
|
|
|
psp->sy = WEAPONBOTTOM;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (player->health <= 0)
|
|
|
|
{ // Player is dead, so keep the weapon off screen
|
|
|
|
P_SetPsprite (player, ps_weapon, NULL);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* if (player->PendingWeapon != WP_NOCHANGE)
|
|
|
|
{ // [RH] Make sure we're actually changing weapons.
|
|
|
|
player->ReadyWeapon = player->PendingWeapon;
|
|
|
|
} */
|
|
|
|
// [RH] Clear the flash state. Only needed for Strife.
|
|
|
|
P_SetPsprite (player, ps_flash, NULL);
|
|
|
|
P_BringUpWeapon (player);
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC A_Raise
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_Raise)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
if (self == NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2008-08-10 20:48:55 +00:00
|
|
|
player_t *player = self->player;
|
2006-02-24 04:48:15 +00:00
|
|
|
pspdef_t *psp;
|
|
|
|
|
|
|
|
if (NULL == player)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (player->PendingWeapon != WP_NOCHANGE)
|
|
|
|
{
|
|
|
|
P_SetPsprite (player, ps_weapon, player->ReadyWeapon->GetDownState());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
psp = &player->psprites[ps_weapon];
|
|
|
|
psp->sy -= RAISESPEED;
|
|
|
|
if (psp->sy > WEAPONTOP)
|
|
|
|
{ // Not raised all the way yet
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
psp->sy = WEAPONTOP;
|
|
|
|
if (player->ReadyWeapon != NULL)
|
|
|
|
{
|
|
|
|
P_SetPsprite (player, ps_weapon, player->ReadyWeapon->GetReadyState());
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
player->psprites[ps_weapon].state = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// A_GunFlash
|
|
|
|
//
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_GunFlash)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
player_t *player = self->player;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (NULL == player)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
player->mo->PlayAttacking2 ();
|
2006-10-31 14:53:21 +00:00
|
|
|
|
|
|
|
FState * flash=NULL;
|
|
|
|
if (player->ReadyWeapon->bAltFire) flash = player->ReadyWeapon->FindState(NAME_AltFlash);
|
|
|
|
if (flash == NULL) flash = player->ReadyWeapon->FindState(NAME_Flash);
|
|
|
|
P_SetPsprite (player, ps_flash, flash);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// WEAPON ATTACKS
|
|
|
|
//
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_BulletSlope
|
|
|
|
// Sets a slope so a near miss is at aproximately
|
|
|
|
// the height of the intended target
|
|
|
|
//
|
|
|
|
|
2008-04-10 14:38:43 +00:00
|
|
|
angle_t P_BulletSlope (AActor *mo, AActor **pLineTarget)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
static const int angdiff[3] = { -1<<26, 1<<26, 0 };
|
|
|
|
int i;
|
|
|
|
angle_t an;
|
2008-04-10 14:38:43 +00:00
|
|
|
angle_t pitch;
|
|
|
|
AActor *linetarget;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// see which target is to be aimed at
|
|
|
|
i = 2;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
an = mo->angle + angdiff[i];
|
2008-04-10 14:38:43 +00:00
|
|
|
pitch = P_AimLineAttack (mo, an, 16*64*FRACUNIT, &linetarget);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (mo->player != NULL &&
|
2007-12-11 04:03:40 +00:00
|
|
|
level.IsFreelookAllowed() &&
|
2006-02-24 04:48:15 +00:00
|
|
|
mo->player->userinfo.aimdist <= ANGLE_1/2)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} while (linetarget == NULL && --i >= 0);
|
2008-06-26 17:25:55 +00:00
|
|
|
if (pLineTarget != NULL)
|
|
|
|
{
|
|
|
|
*pLineTarget = linetarget;
|
|
|
|
}
|
2008-04-10 14:38:43 +00:00
|
|
|
return pitch;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_GunShot
|
|
|
|
//
|
2008-04-10 14:38:43 +00:00
|
|
|
void P_GunShot (AActor *mo, bool accurate, const PClass *pufftype, angle_t pitch)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
angle_t angle;
|
|
|
|
int damage;
|
|
|
|
|
|
|
|
damage = 5*(pr_gunshot()%3+1);
|
|
|
|
angle = mo->angle;
|
|
|
|
|
|
|
|
if (!accurate)
|
|
|
|
{
|
|
|
|
angle += pr_gunshot.Random2 () << 18;
|
|
|
|
}
|
|
|
|
|
2008-04-10 14:38:43 +00:00
|
|
|
P_LineAttack (mo, angle, PLAYERMISSILERANGE, pitch, damage, NAME_None, pufftype);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_Light0)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
if (self->player != NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
self->player->extralight = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_Light1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
if (self->player != NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
self->player->extralight = 1;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_Light2)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
if (self->player != NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
self->player->extralight = 2;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
DEFINE_ACTION_FUNCTION(AInventory, A_Light)
|
2006-05-13 12:41:15 +00:00
|
|
|
{
|
|
|
|
int index=CheckIndex(1, &CallingState);
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
if (self->player != NULL && index > 0)
|
2006-05-13 12:41:15 +00:00
|
|
|
{
|
2008-08-10 20:48:55 +00:00
|
|
|
self->player->extralight = clamp<int>(EvalExpressionI (StateParameters[index], self), 0, 20);
|
2006-05-13 12:41:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_SetupPsprites
|
|
|
|
//
|
|
|
|
// Called at start of level for each player
|
|
|
|
//
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_SetupPsprites(player_t *player)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
// Remove all psprites
|
|
|
|
for (i = 0; i < NUMPSPRITES; i++)
|
|
|
|
{
|
|
|
|
player->psprites[i].state = NULL;
|
|
|
|
}
|
|
|
|
// Spawn the ready weapon
|
|
|
|
player->PendingWeapon = player->ReadyWeapon;
|
|
|
|
P_BringUpWeapon (player);
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_MovePsprites
|
|
|
|
//
|
|
|
|
// Called every tic by player thinking routine
|
|
|
|
//
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_MovePsprites (player_t *player)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
pspdef_t *psp;
|
|
|
|
FState *state;
|
|
|
|
|
|
|
|
// [RH] If you don't have a weapon, then the psprites should be NULL.
|
2006-10-31 14:53:21 +00:00
|
|
|
if (player->ReadyWeapon == NULL && (player->health > 0 || player->mo->DamageType != NAME_Fire))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
P_SetPsprite (player, ps_weapon, NULL);
|
|
|
|
P_SetPsprite (player, ps_flash, NULL);
|
|
|
|
if (player->PendingWeapon != WP_NOCHANGE)
|
|
|
|
{
|
|
|
|
P_BringUpWeapon (player);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
psp = &player->psprites[0];
|
|
|
|
for (i = 0; i < NUMPSPRITES; i++, psp++)
|
|
|
|
{
|
|
|
|
if ((state = psp->state) != NULL) // a null state means not active
|
|
|
|
{
|
|
|
|
// drop tic count and possibly change state
|
|
|
|
if (psp->tics != -1) // a -1 tic count never changes
|
|
|
|
{
|
|
|
|
psp->tics--;
|
|
|
|
if(!psp->tics)
|
|
|
|
{
|
|
|
|
P_SetPsprite (player, i, psp->state->GetNextState());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
|
|
|
|
player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
|
|
|
|
if (player->cheats & CF_WEAPONREADY)
|
|
|
|
{
|
|
|
|
P_CheckWeaponFire (player);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
FArchive &operator<< (FArchive &arc, pspdef_t &def)
|
|
|
|
{
|
|
|
|
return arc << def.state << def.tics << def.sx << def.sy;
|
|
|
|
}
|