Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

API: CSPlayer and CKnife additions + headers refactory #277

Merged
merged 12 commits into from
Jul 15, 2023
Merged

API: CSPlayer and CKnife additions + headers refactory #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9f2e4d6
Implement RG_CreateWeaponBox hook
dystopm May 5, 2023
80ec44b
Merge pull request #1 from PM32/hook_createweaponbox
dystopm May 5, 2023
8bc41a2
Revert "Merge pull request #1 from PM32/hook_createweaponbox"
dystopm Jul 8, 2023
1ea15e8
Implement RG_CreateWeaponBox hook
dystopm May 5, 2023
a94f3d0
Revert "Merge pull request #1 from PM32/hook_createweaponbox"
dystopm Jul 8, 2023
b4fdf1a
Merge branch 'master' of https://github.com/dystopm/reapi
dystopm Jul 8, 2023
94ce3b5
Update regamedll_api.h
dystopm Jul 9, 2023
7687700
Reordered hook_callback.cpp/h declarations based on regamedll_api.h o…
dystopm Jul 9, 2023
6425b1d
Update CKnife members and include descriptions
dystopm Jul 9, 2023
7e7be40
Update CSPlayer members and include descriptions
dystopm Jul 9, 2023
db883f5
Merge remote-tracking branch 'upstream/master' into headers-reordering
dystopm Jul 15, 2023
c47271c
Merge branch 'master' into headers-reordering
dystopm Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4656,6 +4656,22 @@ enum CCSPlayer_Members
* Set params: set_member(index, member, bool:value);
*/
m_bMegaBunnyJumping,

/*
* Description: -
* Member type: bool
* Get params: get_member(index, member);
* Set params: set_member(index, member, bool:value);
*/
m_bPlantC4Anywhere,

/*
* Description: -
* Member type: bool
* Get params: get_member(index, member);
* Set params: set_member(index, member, bool:value);
*/
m_bSpawnProtectionEffects,
};

/**
Expand Down Expand Up @@ -5950,44 +5966,52 @@ enum CKnife_Members
m_Knife_usKnife,

/*
* Description: -
* Description: Stab damage (default: 65.0)
* Member type: float
* Get params: get_member(index, member);
* Set params: set_member(index, member, value);
*/
m_Knife_flStabBaseDamage,

/*
* Description: -
* Description: Swing damage (default: 15.0)
* Member type: float
* Get params: get_member(index, member);
* Set params: set_member(index, member, value);
*/
m_Knife_flSwingBaseDamage,

/*
* Description: -
* Description: Fast Swing (first one) damage (default: 20.0)
* Member type: float
* Get params: get_member(index, member);
* Set params: set_member(index, member, value);
*/
m_Knife_flSwingBaseDamage_Fast,

/*
* Description: -
* Description: Stab distance (default: 32.0)
* Member type: float
* Get params: get_member(index, member);
* Set params: set_member(index, member, value);
*/
m_Knife_flStabDistance,

/*
* Description: -
* Description: Swing distance (default: 64.0)
* Member type: float
* Get params: get_member(index, member);
* Set params: set_member(index, member, value);
*/
m_Knife_flSwingDistance,

/*
* Description: Back Stab damage multiplier (default: 3.0)
* Member type: float
* Get params: get_member(index, member);
* Set params: set_member(index, member, value);
*/
m_Knife_flBackStabMultiplier,
};

/**
Expand Down
11 changes: 9 additions & 2 deletions reapi/include/cssdk/dlls/API/CSPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ class CCSPlayer: public CCSMonster
m_bCanShootOverride(false),
m_bGameForcingRespawn(false),
m_bAutoBunnyHopping(false),
m_bMegaBunnyJumping(false)
m_bMegaBunnyJumping(false),
m_bPlantC4Anywhere(false),
m_bSpawnProtectionEffects(false)
{
m_szModel[0] = '\0';
}
Expand Down Expand Up @@ -100,8 +102,11 @@ class CCSPlayer: public CCSMonster
virtual void SetSpawnProtection(float flProtectionTime) = 0;
virtual void RemoveSpawnProtection() = 0;
virtual bool HintMessageEx(const char *pMessage, float duration = 6.0f, bool bDisplayIfPlayerDead = false, bool bOverride = false) = 0;
virtual void Reset() = 0;
virtual void OnSpawnEquip(bool addDefault = true, bool equipGame = true) = 0;
virtual void SetScoreboardAttributes(CBasePlayer *destination = nullptr) = 0;

void Reset();
void ResetVars();

void OnSpawn();
void OnKilled();
Expand Down Expand Up @@ -131,6 +136,8 @@ class CCSPlayer: public CCSMonster
bool m_bGameForcingRespawn;
bool m_bAutoBunnyHopping;
bool m_bMegaBunnyJumping;
bool m_bPlantC4Anywhere;
bool m_bSpawnProtectionEffects;
};

// Inlines
Expand Down
1 change: 1 addition & 0 deletions reapi/include/cssdk/dlls/weapons.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,7 @@ class CKnife: public CBasePlayerWeapon
float m_flSwingBaseDamage_Fast;
float m_flStabDistance;
float m_flSwingDistance;
float m_flBackStabMultiplier;
};

class CM249: public CBasePlayerWeapon
Expand Down
Loading