CInfClassCharacter: Adjust ActiveWeapon API

infclass · Jan 21, 2024 · 19ba18f · 19ba18f
1 parent 45bf193
commit 19ba18f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/game/server/infclass/entities/infccharacter.cpp b/src/game/server/infclass/entities/infccharacter.cpp
@@ -1453,9 +1453,12 @@ void CInfClassCharacter::SetSuperWeaponIndicatorEnabled(bool Enabled)
 
 INFWEAPON CInfClassCharacter::GetInfWeaponID(int WID) const
 {
+	if(WID < 0)
+		WID = m_ActiveWeapon;
+
 	if(WID == WEAPON_HAMMER)
 	{
-		switch(PrivateGetPlayerClass())
+		switch(GetPlayerClass())
 		{
 		case PLAYERCLASS_NINJA:
 			return INFWEAPON::NINJA_HAMMER;
@@ -1465,7 +1468,7 @@ INFWEAPON CInfClassCharacter::GetInfWeaponID(int WID) const
 	}
 	else if(WID == WEAPON_GUN)
 	{
-		switch(PrivateGetPlayerClass())
+		switch(GetPlayerClass())
 		{
 		case PLAYERCLASS_MERCENARY:
 			return INFWEAPON::MERCENARY_GUN;
@@ -1476,7 +1479,7 @@ INFWEAPON CInfClassCharacter::GetInfWeaponID(int WID) const
 	}
 	else if(WID == WEAPON_SHOTGUN)
 	{
-		switch(PrivateGetPlayerClass())
+		switch(GetPlayerClass())
 		{
 		case PLAYERCLASS_MEDIC:
 			return INFWEAPON::MEDIC_SHOTGUN;
@@ -1490,7 +1493,7 @@ INFWEAPON CInfClassCharacter::GetInfWeaponID(int WID) const
 	}
 	else if(WID == WEAPON_GRENADE)
 	{
-		switch(PrivateGetPlayerClass())
+		switch(GetPlayerClass())
 		{
 		case PLAYERCLASS_MERCENARY:
 			return INFWEAPON::MERCENARY_GRENADE;
@@ -1512,7 +1515,7 @@ INFWEAPON CInfClassCharacter::GetInfWeaponID(int WID) const
 	}
 	else if(WID == WEAPON_LASER)
 	{
-		switch(PrivateGetPlayerClass())
+		switch(GetPlayerClass())
 		{
 		case PLAYERCLASS_ENGINEER:
 			return INFWEAPON::ENGINEER_LASER;

diff --git a/src/game/server/infclass/entities/infccharacter.h b/src/game/server/infclass/entities/infccharacter.h
@@ -129,6 +129,8 @@ class CInfClassCharacter : public CCharacter
 	void Die(const DeathContext &Context);
 
 	void GiveWeapon(int Weapon, int Ammo);
+
+	int ActiveWeapon() const { return m_ActiveWeapon; }
 	void SetActiveWeapon(int Weapon);
 	void SetLastWeapon(int Weapon);
 	bool HasWeapon(int Weapon) const;
@@ -235,7 +237,7 @@ class CInfClassCharacter : public CCharacter
 	bool HasSuperWeaponIndicator() const;
 	void SetSuperWeaponIndicatorEnabled(bool Enabled);
 
-	INFWEAPON GetInfWeaponID(int WID) const;
+	INFWEAPON GetInfWeaponID(int WID = -1) const;
 
 	using CCharacter::GameWorld;
 	using CCharacter::Server;