zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-08 14:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
gzdoom/src/g_hexen/a_pig.cpp

317 lines
9.3 KiB
C++
Raw Normal View History

Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
#include "actor.h"
#include "gi.h"
#include "m_random.h"
#include "s_sound.h"
#include "d_player.h"
#include "a_action.h"
#include "a_pickups.h"
#include "p_local.h"
#include "a_hereticglobal.h"
#include "a_sharedglobal.h"
#include "p_enemy.h"
#include "d_event.h"
#include "gstrings.h"
static FRandom pr_snoutattack ("SnoutAttack");
static FRandom pr_pigattack ("PigAttack");
static FRandom pr_pigplayerthink ("PigPlayerThink");
extern void AdjustPlayerAngle (AActor *);
void A_SnoutAttack (AActor *actor);
void A_PigPain (AActor *);
void A_PigAttack (AActor *);
// Snout puff ---------------------------------------------------------------
class ASnoutPuff : public AActor
{
DECLARE_ACTOR (ASnoutPuff, AActor)
};
FState ASnoutPuff::States[] =
{
S_NORMAL (FHFX, 'S', 4, NULL , &States[1]),
S_NORMAL (FHFX, 'T', 4, NULL , &States[2]),
S_NORMAL (FHFX, 'U', 4, NULL , &States[3]),
S_NORMAL (FHFX, 'V', 4, NULL , &States[4]),
S_NORMAL (FHFX, 'W', 4, NULL , NULL)
};
IMPLEMENT_ACTOR (ASnoutPuff, Hexen, -1, 0)
PROP_Flags (MF_NOBLOCKMAP|MF_NOGRAVITY)
PROP_RenderStyle (STYLE_Translucent)
PROP_Alpha (HX_SHADOW)
PROP_SpawnState (0)
END_DEFAULTS
// Snout --------------------------------------------------------------------
class ASnout : public AWeapon
{
DECLARE_ACTOR (ASnout, AWeapon)
};
FState ASnout::States[] =
{
#define S_SNOUTREADY 0
S_NORMAL (WPIG, 'A', 1, A_WeaponReady , &States[S_SNOUTREADY]),
#define S_SNOUTDOWN 1
S_NORMAL (WPIG, 'A', 1, A_Lower , &States[S_SNOUTDOWN]),
#define S_SNOUTUP 2
S_NORMAL (WPIG, 'A', 1, A_Raise , &States[S_SNOUTUP]),
#define S_SNOUTATK 3
S_NORMAL (WPIG, 'A', 4, A_SnoutAttack , &States[S_SNOUTATK+1]),
S_NORMAL (WPIG, 'B', 8, A_SnoutAttack , &States[S_SNOUTREADY])
};
IMPLEMENT_ACTOR (ASnout, Hexen, -1, 0)
PROP_Weapon_SelectionOrder (10000)
PROP_Weapon_Flags (WIF_DONTBOB|WIF_BOT_MELEE)
PROP_Weapon_UpState (S_SNOUTUP)
PROP_Weapon_DownState (S_SNOUTDOWN)
PROP_Weapon_ReadyState (S_SNOUTREADY)
PROP_Weapon_AtkState (S_SNOUTATK)
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
PROP_Weapon_FlashState (S_SNOUTATK+1) // Not really - but it will do until this gets exported from the EXE
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
PROP_Weapon_Kickback (150)
PROP_Weapon_YAdjust (10)
END_DEFAULTS
// Pig player ---------------------------------------------------------------
class APigPlayer : public APlayerPawn
{
DECLARE_ACTOR (APigPlayer, APlayerPawn)
public:
void MorphPlayerThink ();
};
FState APigPlayer::States[] =
{
#define S_PIGPLAY 0
S_NORMAL (PIGY, 'A', -1, NULL , NULL),
#define S_PIGPLAY_RUN1 (S_PIGPLAY+1)
S_NORMAL (PIGY, 'A', 3, NULL , &States[S_PIGPLAY_RUN1+1]),
S_NORMAL (PIGY, 'B', 3, NULL , &States[S_PIGPLAY_RUN1+2]),
S_NORMAL (PIGY, 'C', 3, NULL , &States[S_PIGPLAY_RUN1+3]),
S_NORMAL (PIGY, 'D', 3, NULL , &States[S_PIGPLAY_RUN1]),
#define S_PIGPLAY_PAIN (S_PIGPLAY_RUN1+4)
S_NORMAL (PIGY, 'D', 4, A_PigPain , &States[S_PIGPLAY]),
#define S_PIGPLAY_ATK1 (S_PIGPLAY_PAIN+1)
S_NORMAL (PIGY, 'A', 12, NULL , &States[S_PIGPLAY]),
#define S_PIGPLAY_DIE1 (S_PIGPLAY_ATK1+1)
S_NORMAL (PIGY, 'E', 4, A_Scream , &States[S_PIGPLAY_DIE1+1]),
S_NORMAL (PIGY, 'F', 3, A_NoBlocking , &States[S_PIGPLAY_DIE1+2]),
S_NORMAL (PIGY, 'G', 4, NULL , &States[S_PIGPLAY_DIE1+3]),
S_NORMAL (PIGY, 'H', 3, NULL , &States[S_PIGPLAY_DIE1+4]),
S_NORMAL (PIGY, 'I', 4, NULL , &States[S_PIGPLAY_DIE1+5]),
S_NORMAL (PIGY, 'J', 4, NULL , &States[S_PIGPLAY_DIE1+6]),
S_NORMAL (PIGY, 'K', 4, NULL , &States[S_PIGPLAY_DIE1+7]),
S_NORMAL (PIGY, 'L', -1, NULL , NULL),
#define S_PIGPLAY_ICE (S_PIGPLAY_DIE1+8)
S_NORMAL (PIGY, 'M', 5, A_FreezeDeath , &States[S_PIGPLAY_ICE+1]),
S_NORMAL (PIGY, 'M', 1, A_FreezeDeathChunks , &States[S_PIGPLAY_ICE+1]),
};
IMPLEMENT_ACTOR (APigPlayer, Hexen, -1, 0)
SVN r27 (trunk)
2006-04-11 16:27:41 +00:00
PROP_SpawnHealth (30)
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
PROP_ReactionTime (0)
PROP_PainChance (255)
PROP_RadiusFixed (16)
PROP_HeightFixed (24)
PROP_SpeedFixed (1)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_NOTDMATCH|MF_FRIENDLY)
PROP_Flags2 (MF2_WINDTHRUST|MF2_FLOORCLIP|MF2_SLIDE|MF2_PASSMOBJ|MF2_TELESTOMP|MF2_PUSHWALL)
PROP_Flags3 (MF3_NOBLOCKMONST)
PROP_Flags4 (MF4_NOSKIN)
PROP_SpawnState (S_PIGPLAY)
PROP_SeeState (S_PIGPLAY_RUN1)
PROP_PainState (S_PIGPLAY_PAIN)
PROP_MissileState (S_PIGPLAY_ATK1)
- Fixed: The check for no skill menu was incorrect when a custom player class menu was present so instead of starting the game specific skill menu it always started Hexen's. - Fixed: When a non-player tried to play a player sound it tried to access the actor object as an APlayerPawn. - Changed PlayAttacking2 to always use the melee state instead of different implementations per player and hard coding it to MissileState+1. Also changed PlayAttacking for the HereticPlayer to use the same animation as PlayAttacking2. Now the special handling for Heretic in the FireWeapon functions can be removed. For R258: - Fixed: PlayerStartItem created a duplicate of the item's class name before converting it into an FName. - Removed game check for Doom from P_BloodSplatter. The BloodSplatter actor is compatible with all games now so the explicit handling is no longer needed. - Moved replacement handling back into AActor::StaticSpawn but controlled by a (mandatory) parameter. Also added replacement to most other instances in the game where non-inventory items are spawned. Replacement is safe nearly everywhere except for inventory related spawns. - Fixed: Due to the player class inclusion A_NoBlocking never called NoBlockingSet for monsters. - Changed: Sounds can be specified by full path now in SNDINFO and S_SKIN. SVN r259 (trunk)
2006-07-16 10:23:14 +00:00
PROP_MeleeState (S_PIGPLAY_ATK1)
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
PROP_DeathState (S_PIGPLAY_DIE1)
PROP_IDeathState (S_PIGPLAY_ICE)
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
// [GRB]
PROP_PlayerPawn_JumpZ (6*FRACUNIT)
PROP_PlayerPawn_ViewHeight (28*FRACUNIT)
PROP_PlayerPawn_ForwardMove1 (FRACUNIT * 0x18 / 0x19) // Yes, the pig is faster than a mage.
PROP_PlayerPawn_ForwardMove2 (FRACUNIT * 0x31 / 0x32)
PROP_PlayerPawn_SideMove1 (FRACUNIT * 0x17 / 0x18)
PROP_PlayerPawn_SideMove2 (FRACUNIT * 0x27 / 0x28)
- Updated thingdef_specials.h for the new thingdef_specials.gperf file. - Created a new MorphedMonster class that Chicken and Pig now derive from. This class automatically takes care of unmorphing the monster when its time is up. - Made PlayerClass and MonsterClass properties of EggFX. You can override these in a subclass to create new kinds of morpher projectiles. Along with that, MorphWeapon is a new property of PlayerPawn that controls what type of weapon you have available while morphed ("None" means you have no weapons). - Changed morphed monsters to record the time when they want to unmorph, not the time left until they unmorph. This simplifies calling P_UpdateMorhpedMonster() because you don't need to pass it a tic count. - Added an optional second parameter to A_SpawnDebris and an optional fifth parameter to A_SpawnItem that both do the same thing: If you set it to 1, then the spawned actor will be assigned the same translation table as the actor that called the function. - Moved the blood colorization in P_SpawnBlood() ahead of the SetDamage() call so that the blood color will available to the states of the blood actor. - Extended the puke command so that giving it a negative script number will act like ACS_ExecuteAlways and always execute the script. (Ugh. Why did I use's Raven's cheat code to name this command?) SVN r296 (trunk)
2006-08-17 00:19:26 +00:00
PROP_PlayerPawn_MorphWeapon ("Snout")
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
PROP_PainSound ("PigPain")
PROP_DeathSound ("PigDeath")
END_DEFAULTS
- Fixed: Morphed pig and chicken players made normal human *usefail sounds. - G_DoSaveGame() now receives the filename and description from its arguments rather than global variables, so autosaves and manual saves can be done in close proximity to each other without overwriting the parameters for one of them. - Fixed potential buffer overrun in G_SaveGame() and added a check so that you can't interfere with saves that are still pending. - Fixed: P_LineAttack() creates temporary puffs to get damage types, but this had the side effect of creating particles for the puff. - Fixed: The Heretic status bar tried to use the graphic "SELECTBOX" for the inventory selector. The correct name is "SELECTBO". - Fixed: Using allowrespawn for a single-player map would fire off enter scripts instead of respawn script because the player wasn't assigned the state PST_REBORN. - Fixed: P_CheckMissileSpawn() now passes the BlockingMobj to P_ExplodeMissile() so that it can select the appropriate death state. - Added the manifest to MinGW-compiled builds of updaterevision so you can build under Vista with MinGW without needing administrative privileges. (But I still want to know why Vista thinks it needs elevated privileges without a manifest telling it otherwise.) - Using four 0xFF bytes for the final note of an IMF song should signal the end of the song. SVN r733 (trunk)
2008-02-05 23:32:49 +00:00
AT_GAME_SET(PigPlayer)
{
RUNTIME_CLASS(APigPlayer)->Meta.SetMetaString(APMETA_SoundClass, "pig");
}
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
void APigPlayer::MorphPlayerThink ()
{
if (player->morphTics&15)
{
return;
}
if(!(momx | momy) && pr_pigplayerthink() < 64)
{ // Snout sniff
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
if (player->ReadyWeapon != NULL)
{
P_SetPspriteNF(player, ps_weapon, player->ReadyWeapon->FindState(NAME_Flash));
}
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
S_Sound (this, CHAN_VOICE, "PigActive1", 1, ATTN_NORM); // snort
return;
}
if (pr_pigplayerthink() < 48)
{
S_Sound (this, CHAN_VOICE, "PigActive", 1, ATTN_NORM);
}
}
// Pig (non-player) ---------------------------------------------------------
- Updated thingdef_specials.h for the new thingdef_specials.gperf file. - Created a new MorphedMonster class that Chicken and Pig now derive from. This class automatically takes care of unmorphing the monster when its time is up. - Made PlayerClass and MonsterClass properties of EggFX. You can override these in a subclass to create new kinds of morpher projectiles. Along with that, MorphWeapon is a new property of PlayerPawn that controls what type of weapon you have available while morphed ("None" means you have no weapons). - Changed morphed monsters to record the time when they want to unmorph, not the time left until they unmorph. This simplifies calling P_UpdateMorhpedMonster() because you don't need to pass it a tic count. - Added an optional second parameter to A_SpawnDebris and an optional fifth parameter to A_SpawnItem that both do the same thing: If you set it to 1, then the spawned actor will be assigned the same translation table as the actor that called the function. - Moved the blood colorization in P_SpawnBlood() ahead of the SetDamage() call so that the blood color will available to the states of the blood actor. - Extended the puke command so that giving it a negative script number will act like ACS_ExecuteAlways and always execute the script. (Ugh. Why did I use's Raven's cheat code to name this command?) SVN r296 (trunk)
2006-08-17 00:19:26 +00:00
class APig : public AMorphedMonster
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
{
- Updated thingdef_specials.h for the new thingdef_specials.gperf file. - Created a new MorphedMonster class that Chicken and Pig now derive from. This class automatically takes care of unmorphing the monster when its time is up. - Made PlayerClass and MonsterClass properties of EggFX. You can override these in a subclass to create new kinds of morpher projectiles. Along with that, MorphWeapon is a new property of PlayerPawn that controls what type of weapon you have available while morphed ("None" means you have no weapons). - Changed morphed monsters to record the time when they want to unmorph, not the time left until they unmorph. This simplifies calling P_UpdateMorhpedMonster() because you don't need to pass it a tic count. - Added an optional second parameter to A_SpawnDebris and an optional fifth parameter to A_SpawnItem that both do the same thing: If you set it to 1, then the spawned actor will be assigned the same translation table as the actor that called the function. - Moved the blood colorization in P_SpawnBlood() ahead of the SetDamage() call so that the blood color will available to the states of the blood actor. - Extended the puke command so that giving it a negative script number will act like ACS_ExecuteAlways and always execute the script. (Ugh. Why did I use's Raven's cheat code to name this command?) SVN r296 (trunk)
2006-08-17 00:19:26 +00:00
DECLARE_ACTOR (APig, AMorphedMonster)
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
};
FState APig::States[] =
{
#define S_PIG_LOOK1 0
- Updated thingdef_specials.h for the new thingdef_specials.gperf file. - Created a new MorphedMonster class that Chicken and Pig now derive from. This class automatically takes care of unmorphing the monster when its time is up. - Made PlayerClass and MonsterClass properties of EggFX. You can override these in a subclass to create new kinds of morpher projectiles. Along with that, MorphWeapon is a new property of PlayerPawn that controls what type of weapon you have available while morphed ("None" means you have no weapons). - Changed morphed monsters to record the time when they want to unmorph, not the time left until they unmorph. This simplifies calling P_UpdateMorhpedMonster() because you don't need to pass it a tic count. - Added an optional second parameter to A_SpawnDebris and an optional fifth parameter to A_SpawnItem that both do the same thing: If you set it to 1, then the spawned actor will be assigned the same translation table as the actor that called the function. - Moved the blood colorization in P_SpawnBlood() ahead of the SetDamage() call so that the blood color will available to the states of the blood actor. - Extended the puke command so that giving it a negative script number will act like ACS_ExecuteAlways and always execute the script. (Ugh. Why did I use's Raven's cheat code to name this command?) SVN r296 (trunk)
2006-08-17 00:19:26 +00:00
S_NORMAL (PIGY, 'B', 10, A_Look , &States[S_PIG_LOOK1]),
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
#define S_PIG_WALK1 (S_PIG_LOOK1+1)
- Updated thingdef_specials.h for the new thingdef_specials.gperf file. - Created a new MorphedMonster class that Chicken and Pig now derive from. This class automatically takes care of unmorphing the monster when its time is up. - Made PlayerClass and MonsterClass properties of EggFX. You can override these in a subclass to create new kinds of morpher projectiles. Along with that, MorphWeapon is a new property of PlayerPawn that controls what type of weapon you have available while morphed ("None" means you have no weapons). - Changed morphed monsters to record the time when they want to unmorph, not the time left until they unmorph. This simplifies calling P_UpdateMorhpedMonster() because you don't need to pass it a tic count. - Added an optional second parameter to A_SpawnDebris and an optional fifth parameter to A_SpawnItem that both do the same thing: If you set it to 1, then the spawned actor will be assigned the same translation table as the actor that called the function. - Moved the blood colorization in P_SpawnBlood() ahead of the SetDamage() call so that the blood color will available to the states of the blood actor. - Extended the puke command so that giving it a negative script number will act like ACS_ExecuteAlways and always execute the script. (Ugh. Why did I use's Raven's cheat code to name this command?) SVN r296 (trunk)
2006-08-17 00:19:26 +00:00
S_NORMAL (PIGY, 'A', 3, A_Chase , &States[S_PIG_WALK1+1]),
S_NORMAL (PIGY, 'B', 3, A_Chase , &States[S_PIG_WALK1+2]),
S_NORMAL (PIGY, 'C', 3, A_Chase , &States[S_PIG_WALK1+3]),
S_NORMAL (PIGY, 'D', 3, A_Chase , &States[S_PIG_WALK1]),
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
#define S_PIG_PAIN (S_PIG_WALK1+4)
S_NORMAL (PIGY, 'D', 4, A_PigPain , &States[S_PIG_WALK1]),
#define S_PIG_ATK1 (S_PIG_PAIN+1)
S_NORMAL (PIGY, 'A', 5, A_FaceTarget , &States[S_PIG_ATK1+1]),
S_NORMAL (PIGY, 'A', 10, A_PigAttack , &States[S_PIG_WALK1]),
#define S_PIG_DIE1 (S_PIG_ATK1+2)
S_NORMAL (PIGY, 'E', 4, A_Scream , &States[S_PIG_DIE1+1]),
S_NORMAL (PIGY, 'F', 3, A_NoBlocking , &States[S_PIG_DIE1+2]),
S_NORMAL (PIGY, 'G', 4, A_QueueCorpse , &States[S_PIG_DIE1+3]),
S_NORMAL (PIGY, 'H', 3, NULL , &States[S_PIG_DIE1+4]),
S_NORMAL (PIGY, 'I', 4, NULL , &States[S_PIG_DIE1+5]),
S_NORMAL (PIGY, 'J', 4, NULL , &States[S_PIG_DIE1+6]),
S_NORMAL (PIGY, 'K', 4, NULL , &States[S_PIG_DIE1+7]),
S_NORMAL (PIGY, 'L', -1, NULL , NULL),
#define S_PIG_ICE (S_PIG_DIE1+8)
S_NORMAL (PIGY, 'M', 5, A_FreezeDeath , &States[S_PIG_ICE+1]),
S_NORMAL (PIGY, 'M', 1, A_FreezeDeathChunks , &States[S_PIG_ICE+1]),
};
IMPLEMENT_ACTOR (APig, Hexen, -1, 0)
PROP_SpawnHealth (25)
PROP_PainChance (128)
PROP_SpeedFixed (10)
PROP_RadiusFixed (12)
PROP_HeightFixed (22)
PROP_Mass (60)
PROP_Flags (MF_SOLID|MF_SHOOTABLE)
PROP_Flags2 (MF2_WINDTHRUST|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_TELESTOMP|MF2_PUSHWALL)
PROP_Flags3 (MF3_DONTMORPH|MF3_ISMONSTER)
PROP_SpawnState (S_PIG_LOOK1)
PROP_SeeState (S_PIG_WALK1)
PROP_PainState (S_PIG_PAIN)
PROP_MeleeState (S_PIG_ATK1)
PROP_DeathState (S_PIG_DIE1)
PROP_IDeathState (S_PIG_ICE)
PROP_SeeSound ("PigActive1")
PROP_PainSound ("PigPain")
PROP_DeathSound ("PigDeath")
PROP_ActiveSound ("PigActive1")
END_DEFAULTS
- Converted a_doomhealth.cpp to DECORATE. - Added a PickupMessage property to the internal actor parser, replaced most of the virtual PickupMessages with it and placed the code that reads the metadata into AInventory::PickupMessage. Now the PickupMessage method is truly virtual and I can do: Added a Health.LowMessage property to define double message items like Doom's medikit in DECORATE. - Since defining Mana3 as an ammo type and then overriding the TryPickup method means that this item defeats all ammo checks in the game it might as well be defined as a CustomInventory item. At least this fixes the amount given in easy and very hard skills. - Converted all ammo items to DECORATE. - Changed internal property setting of ammo types and sister weapons to use fuglyname as for DECORATE definitions. This allows to export the ammo definitions into DECORATE definitions without doing it for the weapons themselves. - Replaced obituary methods with actor properties. - Fixed: The secret map check didn't work for maps inside Zips. SVN r196 (trunk)
2006-06-17 20:29:41 +00:00
//============================================================================
//
// A_SnoutAttack
//
//============================================================================
void A_SnoutAttack (AActor *actor)
{
angle_t angle;
int damage;
int slope;
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
player_t *player;
- Fixed: Turning off follow mode with automap rotating enabled did not function in an easy-to-understand manner. - Fixed: D_AddWildFile() blindly assumed that all matches were files. - Added back the dead player check to CheckIfExitIsGood(), but now it applies only if the next map is part of the same hub. Otherwise, you can still exit the map while dead. - Removed the SpawnedPuff global variable and made it a return value from P_LineAttack(). - Fixed: P_SpawnPuff() played sounds for temporary puffs. SVN r739 (trunk)
2008-02-12 05:54:03 +00:00
AActor *puff;
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
if (NULL == (player = actor->player))
{
return;
}
- Converted a_doomhealth.cpp to DECORATE. - Added a PickupMessage property to the internal actor parser, replaced most of the virtual PickupMessages with it and placed the code that reads the metadata into AInventory::PickupMessage. Now the PickupMessage method is truly virtual and I can do: Added a Health.LowMessage property to define double message items like Doom's medikit in DECORATE. - Since defining Mana3 as an ammo type and then overriding the TryPickup method means that this item defeats all ammo checks in the game it might as well be defined as a CustomInventory item. At least this fixes the amount given in easy and very hard skills. - Converted all ammo items to DECORATE. - Changed internal property setting of ammo types and sister weapons to use fuglyname as for DECORATE definitions. This allows to export the ammo definitions into DECORATE definitions without doing it for the weapons themselves. - Replaced obituary methods with actor properties. - Fixed: The secret map check didn't work for maps inside Zips. SVN r196 (trunk)
2006-06-17 20:29:41 +00:00
damage = 3+(pr_snoutattack()&3);
angle = player->mo->angle;
slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided line. - Fixed: P_SpawnPuff assumed that all melee attacks have the same range (MELEERANGE) and didn't set the puff to its melee state if the range was different. Even worse, it checked a global variable for this so the behavior was undefined when P_SpawnPuff was called from anywhere else but P_LineAttack. To reduce the amount of parameters I combined this information with the hitthing and temporary parameters into one flags parameter. Also changed P_LineAttack so that it gets passed an additional parameter that specifies whether the attack is a melee attack or not and set this to true in all calls that are to be considered melee attacks. I couldn't use the damage type because A_CustomPunch and A_CustomMeleeAttack allow passing any damage type they want. - Added a sprite option as an alternative of particles for FX_ROCKET and FX_GRENADE. SVN r879 (trunk)
2008-04-04 14:31:20 +00:00
puff = P_LineAttack(player->mo, angle, MELEERANGE, slope, damage, NAME_Melee, RUNTIME_CLASS(ASnoutPuff), true);
- Converted a_doomhealth.cpp to DECORATE. - Added a PickupMessage property to the internal actor parser, replaced most of the virtual PickupMessages with it and placed the code that reads the metadata into AInventory::PickupMessage. Now the PickupMessage method is truly virtual and I can do: Added a Health.LowMessage property to define double message items like Doom's medikit in DECORATE. - Since defining Mana3 as an ammo type and then overriding the TryPickup method means that this item defeats all ammo checks in the game it might as well be defined as a CustomInventory item. At least this fixes the amount given in easy and very hard skills. - Converted all ammo items to DECORATE. - Changed internal property setting of ammo types and sister weapons to use fuglyname as for DECORATE definitions. This allows to export the ammo definitions into DECORATE definitions without doing it for the weapons themselves. - Replaced obituary methods with actor properties. - Fixed: The secret map check didn't work for maps inside Zips. SVN r196 (trunk)
2006-06-17 20:29:41 +00:00
S_Sound(player->mo, CHAN_VOICE, "PigActive", 1, ATTN_NORM);
if(linetarget)
{
AdjustPlayerAngle(player->mo);
- Fixed: Turning off follow mode with automap rotating enabled did not function in an easy-to-understand manner. - Fixed: D_AddWildFile() blindly assumed that all matches were files. - Added back the dead player check to CheckIfExitIsGood(), but now it applies only if the next map is part of the same hub. Otherwise, you can still exit the map while dead. - Removed the SpawnedPuff global variable and made it a return value from P_LineAttack(). - Fixed: P_SpawnPuff() played sounds for temporary puffs. SVN r739 (trunk)
2008-02-12 05:54:03 +00:00
if(puff != NULL)
- Converted a_doomhealth.cpp to DECORATE. - Added a PickupMessage property to the internal actor parser, replaced most of the virtual PickupMessages with it and placed the code that reads the metadata into AInventory::PickupMessage. Now the PickupMessage method is truly virtual and I can do: Added a Health.LowMessage property to define double message items like Doom's medikit in DECORATE. - Since defining Mana3 as an ammo type and then overriding the TryPickup method means that this item defeats all ammo checks in the game it might as well be defined as a CustomInventory item. At least this fixes the amount given in easy and very hard skills. - Converted all ammo items to DECORATE. - Changed internal property setting of ammo types and sister weapons to use fuglyname as for DECORATE definitions. This allows to export the ammo definitions into DECORATE definitions without doing it for the weapons themselves. - Replaced obituary methods with actor properties. - Fixed: The secret map check didn't work for maps inside Zips. SVN r196 (trunk)
2006-06-17 20:29:41 +00:00
{ // Bit something
S_Sound(player->mo, CHAN_VOICE, "PigAttack", 1, ATTN_NORM);
}
}
}
//============================================================================
//
// A_PigAttack
//
//============================================================================
void A_PigAttack (AActor *actor)
{
if (!actor->target)
{
return;
}
if (actor->CheckMeleeRange ())
{
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
P_DamageMobj(actor->target, actor, actor, 2+(pr_pigattack()&1), NAME_Melee);
- Converted a_doomhealth.cpp to DECORATE. - Added a PickupMessage property to the internal actor parser, replaced most of the virtual PickupMessages with it and placed the code that reads the metadata into AInventory::PickupMessage. Now the PickupMessage method is truly virtual and I can do: Added a Health.LowMessage property to define double message items like Doom's medikit in DECORATE. - Since defining Mana3 as an ammo type and then overriding the TryPickup method means that this item defeats all ammo checks in the game it might as well be defined as a CustomInventory item. At least this fixes the amount given in easy and very hard skills. - Converted all ammo items to DECORATE. - Changed internal property setting of ammo types and sister weapons to use fuglyname as for DECORATE definitions. This allows to export the ammo definitions into DECORATE definitions without doing it for the weapons themselves. - Replaced obituary methods with actor properties. - Fixed: The secret map check didn't work for maps inside Zips. SVN r196 (trunk)
2006-06-17 20:29:41 +00:00
S_Sound(actor, CHAN_WEAPON, "PigAttack", 1, ATTN_NORM);
}
}
//============================================================================
//
// A_PigPain
//
//============================================================================
void A_PigPain (AActor *actor)
{
A_Pain (actor);
if (actor->z <= actor->floorz)
{
actor->momz = FRACUNIT*7/2;
}
}
Reference in a new issue Copy permalink