Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-10 12:36:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Cleaned up Sentient class

Browse source 
Moved combat stuff to sentient_combat.cpp
Formatted source files
This commit is contained in:
smallmodel 2023-08-09 19:45:39 +02:00
parent f313b6a058
commit 987af7eb81
No known key found for this signature in database
GPG key ID: A96F163ED4891440
3 changed files with 3873 additions and 4513 deletions
Download patch file Download diff file Expand all files Collapse all files

4485
code/fgame/sentient.cpp
View file

File diff suppressed because it is too large Load diff

396
code/fgame/sentient.h
View file

@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// sentient.h: Base class of entity that can carry other entities, and use weapons. // sentient.h: Base class of entity that can carry other entities, and use weapons.
// //
#ifndef __SENTIENT_H__ #pragma once
#define __SENTIENT_H__
#include "g_local.h" #include "g_local.h"
#include "container.h" #include "container.h"
@ -98,38 +97,20 @@ class TurretGun;
#define THREATBIAS_IGNOREME 0xFFFFE4C7 #define THREATBIAS_IGNOREME 0xFFFFE4C7
typedef SafePtr< Weapon > WeaponPtr; typedef SafePtr<Weapon> WeaponPtr;
class ActiveWeapon : public Class class ActiveWeapon : public Class
{ {
public: public:
WeaponPtr weapon; WeaponPtr weapon;
weaponhand_t hand; weaponhand_t hand;
ActiveWeapon(); ActiveWeapon();
void Archive( Archiver &arc ); void Archive(Archiver& arc);
}; };
inline ActiveWeapon::ActiveWeapon
(
)
{
hand = WEAPON_ERROR;
}
inline void ActiveWeapon::Archive
(
Archiver &arc
)
{
arc.ArchiveObjectPointer( ( Class ** )&weapon );
ArchiveEnum( hand, weaponhand_t );
}
class Sentient : public Animate class Sentient : public Animate
{ {
protected: protected:
Container<int> inventory; Container<int> inventory;
Container<Ammo *> ammo_inventory; Container<Ammo *> ammo_inventory;
float LMRF; float LMRF;
@ -141,87 +122,76 @@ class Sentient : public Animate
float offset_time; float offset_time;
float charge_start_time; float charge_start_time;
str blood_model; str blood_model;
SafePtr<Weapon> activeWeaponList[ MAX_ACTIVE_WEAPONS ]; SafePtr<Weapon> activeWeaponList[MAX_ACTIVE_WEAPONS];
ActiveWeapon newActiveWeapon; ActiveWeapon newActiveWeapon;
WeaponPtr holsteredWeapon; WeaponPtr holsteredWeapon;
bool weapons_holstered_by_code; bool weapons_holstered_by_code;
ActiveWeapon lastActiveWeapon; ActiveWeapon lastActiveWeapon;
float m_fDamageMultipliers[ MAX_DAMAGE_MULTIPLIERS ]; float m_fDamageMultipliers[MAX_DAMAGE_MULTIPLIERS];
class SafePtr<Vehicle> m_pVehicle; class SafePtr<Vehicle> m_pVehicle;
SafePtr< TurretGun > m_pTurret; SafePtr<TurretGun> m_pTurret;
SafePtr< Entity > m_pLadder; SafePtr<Entity> m_pLadder;
str m_sHelmetSurface1; str m_sHelmetSurface1;
str m_sHelmetSurface2; str m_sHelmetSurface2;
str m_sHelmetTiki; str m_sHelmetTiki;
float m_fHelmetSpeed; float m_fHelmetSpeed;
bool m_bDontDropWeapons; bool m_bDontDropWeapons;
virtual void EventTake( Event *ev ); virtual void EventTake(Event *ev);
virtual void EventFreeInventory( Event *ev ); virtual void EventGiveAmmo(Event *ev);
virtual void EventGiveAmmo( Event *ev ); virtual void EventGiveItem(Event *ev);
virtual void EventGiveItem( Event *ev ); void EventGiveDynItem(Event *ev);
void SetBloodModel( Event *ev ); void SetBloodModel(Event *ev);
virtual void EventGiveTargetname( Event *ev ); void EventUseItem(Event *ev);
void EventUseWeaponClass(Event *ev);
virtual void EventGiveTargetname(Event *ev);
void EventGerman( Event *ev ); void EventGerman(Event *ev);
void EventAmerican( Event *ev ); void EventAmerican(Event *ev);
void EventGetTeam( Event *ev ); void EventGetTeam(Event *ev);
virtual void ClearEnemies(); virtual void ClearEnemies();
void EventGetThreatBias( Event *ev ); void EventGetThreatBias(Event *ev);
void EventSetThreatBias( Event *ev ); void EventSetThreatBias(Event *ev);
void SetDamageMult( Event *ev ); void SetDamageMult(Event *ev);
void SetupHelmet( str sHelmetTiki, float fSpeed, float fDamageMult, str sHelmetSurface1, str sHelmetSurface2 ); void SetupHelmet(str sHelmetTiki, float fSpeed, float fDamageMult, str sHelmetSurface1, str sHelmetSurface2);
void EventSetupHelmet( Event *ev ); void EventSetupHelmet(Event *ev);
void EventPopHelmet( Event *ev ); void EventPopHelmet(Event *ev);
bool WearingHelmet( void ); bool WearingHelmet(void);
int CheckHitLocation( int iLocation ); int CheckHitLocation(int iLocation);
// Squad stuff virtual void ArmorDamage(Event *ev);
bool IsTeamMate( Sentient *pOther ); virtual qboolean CanBlock(int meansofdeath, qboolean full_block);
void JoinNearbySquads( float fJoinRadius = 1024.0f ); void AddBloodSpurt(Vector direction);
void MergeWithSquad( Sentient *pFriendly ); qboolean ShouldBleed(int meansofdeath, qboolean dead);
void DisbandSquadMate( Sentient *pExFriendly ); qboolean ShouldGib(int meansofdeath, float damage);
bool IsSquadMate( Sentient *pFriendly ); str GetBloodSpurtName(void);
str GetBloodSplatName(void);
float GetBloodSplatSize(void);
str GetGibName(void);
virtual void TurnOffShadow(Event *ev);
virtual void TurnOnShadow(Event *ev);
virtual void WeaponKnockedFromHands(void);
virtual void ArmorDamage( Event *ev ); void EventDropItems(Event *ev);
virtual qboolean CanBlock( int meansofdeath, qboolean full_block ); void EventDontDropWeapons(Event *ev);
void AddBloodSpurt( Vector direction ); void DetachAllActiveWeapons(void);
qboolean ShouldBleed( int meansofdeath, qboolean dead ); void AttachAllActiveWeapons(void);
qboolean ShouldGib( int meansofdeath, float damage ); qboolean WeaponsOut(void);
str GetBloodSpurtName( void ); qboolean IsActiveWeapon(Weapon *weapon);
str GetBloodSplatName( void ); void ActivateWeapon(Weapon *weapon, weaponhand_t hand);
float GetBloodSplatSize( void ); void ActivateLastActiveWeapon(void);
str GetGibName( void ); void EventActivateLastActiveWeapon(Event *ev);
virtual void TurnOffShadow( Event *ev ); void EventToggleItemUse(Event *ev);
virtual void TurnOnShadow( Event *ev ); void DeactivateWeapon(Weapon *weapon);
virtual void WeaponKnockedFromHands( void ); void DeactivateWeapon(weaponhand_t hand);
void CheckAnimations(Event *ev);
void ChargeWeapon(weaponhand_t hand, firemode_t mode);
void FireWeapon(int number, firemode_t mode);
void ReleaseFireWeapon(int number, firemode_t mode);
void Link();
void Unlink();
void UpdateOffsetColor( Event *ev ); public:
void DetachAllActiveWeapons( void );
void AttachAllActiveWeapons( void );
void UpdateWeapons( void );
qboolean IsActiveWeapon( Weapon *weapon );
void ActivateWeapon( Weapon *weapon, weaponhand_t hand );
void ActivateNewWeapon( Event *ev );
void ActivateNewWeapon( void );
void DeactivateWeapon( Weapon *weapon );
void DeactivateWeapon( weaponhand_t hand );
void DeactivateWeapon( Event *ev );
void ActivateLastActiveWeapon( void );
void CheckAnimations( Event *ev );
void EventActivateLastActiveWeapon( Event *ev );
void EventDropItems( Event *ev );
void EventDontDropWeapons( Event *ev );
void EventUseItem( Event *ev );
void EventUseWeaponClass( Event *ev );
void EventToggleItem( Event *ev );
void ReloadWeapon( Event *ev );
void GetActiveWeap( Event *ev );
void GetNewActiveWeapon( Event *ev );
public:
Vector mTargetPos; Vector mTargetPos;
float mAccuracy; float mAccuracy;
SafePtr<Sentient> m_pNextSquadMate; SafePtr<Sentient> m_pNextSquadMate;
@ -250,7 +220,7 @@ class Sentient : public Animate
bool on_fire; bool on_fire;
float on_fire_stop_time; float on_fire_stop_time;
float next_catch_on_fire_time; float next_catch_on_fire_time;
int on_fire_tagnums[ 3 ]; int on_fire_tagnums[3];
SafePtr<Entity> fire_owner; SafePtr<Entity> fire_owner;
bool attack_blocked; bool attack_blocked;
float attack_blocked_time; float attack_blocked_time;
@ -260,147 +230,125 @@ class Sentient : public Animate
bool m_bFootOnGround_Right; bool m_bFootOnGround_Right;
bool m_bFootOnGround_Left; bool m_bFootOnGround_Left;
CLASS_PROTOTYPE( Sentient ); CLASS_PROTOTYPE(Sentient);
Sentient(); Sentient();
virtual ~Sentient(); virtual ~Sentient();
Vector EyePosition( void ); virtual Vector EyePosition(void);
virtual Vector GunPosition( void ); virtual void SetViewAngles(Vector angles);
virtual Vector GunTarget( bool bNoCollision = false ); virtual void SetTargetViewAngles(Vector angles);
void FireWeapon( Event *ev ); virtual Vector GetViewAngles(void);
void FireWeapon( int number, firemode_t mode ); void AddViewVariation(const Vector &vVariation);
void StopFireWeapon( Event *ev ); void SetMinViewVariation(const Vector &vVariation);
void ChargeWeapon( Event *ev ); bool CanSee(Entity *ent, float fov, float vision_distance) override;
void ChargeWeapon( weaponhand_t hand, firemode_t mode ); virtual Vector GunPosition(void);
void ReleaseFireWeapon( Event *ev ); virtual Vector GunTarget(bool bNoCollision = false);
void ReleaseFireWeapon( int number, firemode_t mode ); void ReloadWeapon(Event *ev);
void ChangeWeapon( Weapon *weapon, weaponhand_t hand ); void FireWeapon(Event *ev);
Weapon *GetActiveWeapon( weaponhand_t hand ); void StopFireWeapon(Event *ev);
Weapon *BestWeapon( Weapon *ignore = NULL, qboolean bGetItem = false, int iIgnoreClass = 0 ); void ChargeWeapon(Event *ev);
Weapon *WorstWeapon( Weapon *ignore = NULL, qboolean bGetItem = false, int iIgnoreClass = 0 ); void ReleaseFireWeapon(Event *ev);
Weapon *NextWeapon( Weapon *weapon ); void ChangeWeapon(Weapon *weapon, weaponhand_t hand);
Weapon *PreviousWeapon( Weapon *weapon ); Weapon *GetActiveWeapon(weaponhand_t hand) const;
virtual void useWeapon( const char *weaponname, weaponhand_t hand ); Weapon *WorstWeapon(Weapon *ignore = NULL, qboolean bGetItem = false, int iIgnoreClass = 0);
virtual void useWeapon( Weapon *weapon, weaponhand_t hand ); Weapon *BestWeapon(Weapon *ignore = NULL, qboolean bGetItem = false, int iIgnoreClass = 0);
qboolean WeaponsOut( void ); Weapon *NextWeapon(Weapon *weapon);
void Holster( qboolean putaway ); Weapon *PreviousWeapon(Weapon *weapon);
void SafeHolster( qboolean putaway ); void useWeapon(const char *weaponname, weaponhand_t hand = WEAPON_MAIN);
bool IsNewActiveWeapon( void ); void useWeapon(Weapon *weapon, weaponhand_t hand = WEAPON_MAIN);
Weapon *GetNewActiveWeapon( void ); void EventUseWeapon(Event *ev);
weaponhand_t GetNewActiveWeaponHand( void ); void EventDeactivateWeapon(Event *ev);
void ClearNewActiveWeapon( void ); int NumWeapons(void);
int NumWeapons( void ); int AmmoCount(str ammo_type);
int AmmoCount( str ammo_type ); int MaxAmmoCount(str ammo_type);
int MaxAmmoCount( str ammo_type ); int AmmoIndex(str ammo_type);
int AmmoIndex( str ammo_type ); int UseAmmo(str ammo_type, int amount);
int UseAmmo( str ammo_type, int amount ); void GiveAmmo(str type, int amount, int max_amount = -1);
void GiveAmmo( str type, int amount, int max_amount = -1 ); Ammo *FindAmmoByName(str name);
Ammo *FindAmmoByName( str name ); Item *giveItem(str itemname, int amount = 1);
Item *giveItem( str itemname, int amount = 1 ); void takeItem(const char *itemname);
void takeItem( const char *itemname ); void takeAmmoType(const char *ammoname);
void takeAmmoType( const char *ammoname ); void AddItem(Item *object);
void AddItem( Item *object ); void RemoveItem(Item *object);
void RemoveItem( Item *object ); void RemoveWeapons(void);
void RemoveWeapons( void ); Weapon *GetWeapon(int index);
Weapon *GetWeapon( int index ); Item *FindItemByClassName(const char *classname);
Item *FindItemByClassName( const char *classname ); Item *FindItemByModelname(const char *modelname);
Item *FindItemByModelname( const char *modelname ); Item *FindItemByExternalName(const char *externalname);
Item *FindItemByExternalName( const char *externalname ); Item *FindItem(const char *itemname);
Item *FindItem( const char *itemname ); void FreeInventory(void);
void FreeInventory( void ); void EventFreeInventory(Event *ev);
qboolean HasItem( const char *itemname ); qboolean HasItem(const char *itemname);
qboolean HasWeaponClass( int iWeaponClass ); qboolean HasWeaponClass(int iWeaponClass);
qboolean HasPrimaryWeapon( void ); qboolean HasPrimaryWeapon(void);
qboolean HasSecondaryWeapon( void ); qboolean HasSecondaryWeapon(void);
int NumInventoryItems( void ); int NumInventoryItems(void);
Item *NextItem( Item *item ); Item *NextItem(Item *item);
Item *PrevItem( Item *item ); Item *PrevItem(Item *item);
virtual void DropInventoryItems( void ); virtual void DropInventoryItems(void);
void ListInventory( void ); void ListInventory(void);
bool CanSee( Entity *ent, float fov, float vision_distance ) override; qboolean PowerupActive(void);
virtual void SetViewAngles( Vector angles );
virtual Vector GetViewAngles( void );
qboolean PowerupActive( void ); void setModel(const char *model) override;
void Archive(Archiver &arc) override;
void ArchivePersistantData(Archiver &arc);
void DoubleArmor(void);
virtual qboolean DoGib(int meansofdeath, Entity *inflictor);
void JumpXY(Event *ev);
void MeleeAttackStart(Event *ev);
void MeleeAttackEnd(Event *ev);
void BlockStart(Event *ev);
void BlockEnd(Event *ev);
void StunStart(Event *ev);
void StunEnd(Event *ev);
void SetAttackBlocked(bool blocked);
virtual void ReceivedItem(Item *item);
virtual void RemovedItem(Item *item);
virtual void AmmoAmountChanged(Ammo *ammo, int inclip = 0);
void AmmoAmountInClipChanged(str ammo_type, int amount);
void setModel( const char *model ) override; void SetMaxMouthAngle(Event *ev);
void Archive( Archiver &arc ) override; void TryLightOnFire(int meansofdeath, Entity *attacker);
void ArchivePersistantData( Archiver &arc ); void OnFire(Event *ev);
void DoubleArmor( void ); void StopOnFire(Event *ev);
virtual qboolean DoGib( int meansofdeath, Entity *inflictor ); void SpawnBloodyGibs(Event *ev);
void JumpXY( Event *ev ); void SetMaxGibs(Event *ev);
void MeleeAttackStart( Event *ev ); virtual void GetStateAnims(Container<const char *> *c);
void MeleeAttackEnd( Event *ev ); void SpawnEffect(str modelname, Vector pos);
void BlockStart( Event *ev );
void BlockEnd( Event *ev );
void StunStart( Event *ev );
void StunEnd( Event *ev );
void SetAttackBlocked( bool blocked );
void SetOffsetColor( float r, float g, float b, float time );
virtual void ReceivedItem( Item * item );
virtual void RemovedItem( Item * item );
virtual void AmmoAmountChanged( Ammo * ammo, int inclip = 0 );
void AmmoAmountInClipChanged( str ammo_type, int amount );
void PutawayWeapon( Event *ev ); bool IsNewActiveWeapon(void);
void WeaponCommand( Event *ev ); Weapon *GetNewActiveWeapon(void);
weaponhand_t GetNewActiveWeaponHand(void);
VehicleTank *GetVehicleTank( void ); void ClearNewActiveWeapon(void);
void Holster(qboolean putaway);
void UpdateFootsteps( void ); void SafeHolster(qboolean putaway);
void ActivateNewWeapon(void);
void SetMaxMouthAngle( Event *ev ); void ActivateNewWeapon(Event *ev);
void TryLightOnFire( int meansofdeath, Entity *attacker ); void UpdateWeapons(void);
void OnFire( Event *ev ); VehicleTank *GetVehicleTank(void);
void StopOnFire( Event *ev ); void UpdateFootsteps(void);
void SpawnBloodyGibs( Event *ev ); qboolean AIDontFace() const override;
void SetMaxGibs( Event *ev ); void PutawayWeapon(Event *ev);
virtual void GetStateAnims( Container<const char *> *c ); void WeaponCommand(Event *ev);
void SpawnEffect( str modelname, Vector pos ); //
}; // Squad stuff
//
inline bool Sentient::IsNewActiveWeapon void AssertValidSquad();
( bool IsTeamMate(Sentient *pOther);
void void JoinNearbySquads(float fJoinRadius = 1024.0f);
) void MergeWithSquad(Sentient *pFriendly);
void DisbandSquadMate(Sentient *pExFriendly);
{ bool IsSquadMate(Sentient *pFriendly);
return ( newActiveWeapon.weapon != NULL );
}
inline weaponhand_t Sentient::GetNewActiveWeaponHand
(
void
)
{
return newActiveWeapon.hand;
}
inline Weapon *Sentient::GetNewActiveWeapon
(
void
)
{
return newActiveWeapon.weapon;
}
inline void Sentient::ClearNewActiveWeapon
(
void
)
{
newActiveWeapon.weapon.Clear();
newActiveWeapon.hand = WEAPON_ERROR;
}
//
// Custom openmohaa stuff
//
void GetActiveWeap(Event *ev);
void GetNewActiveWeapon(Event *ev);
};
typedef SafePtr<Sentient> SentientPtr; typedef SafePtr<Sentient> SentientPtr;
extern Container<Sentient *> SentientList; extern Container<Sentient *> SentientList;
#endif /* sentient.h */

1179
code/fgame/sentient_combat.cpp Normal file
View file

File diff suppressed because it is too large Load diff