Enhanced rg_remove_item: add new param remove ammunition

rehlds · Feb 16, 2018 · 8d00573 · 8d00573
1 parent 9e41f5f
commit 8d00573
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/reapi/extra/amxmodx/scripting/include/reapi_gamedll.inc b/reapi/extra/amxmodx/scripting/include/reapi_gamedll.inc
@@ -497,10 +497,11 @@ native rg_internal_cmd(const index, const cmd[], const arg[] = "");
 *
 * @param index      Client index
 * @param item_name  Item classname
+* @param removeAmmo Remove ammunition
 *
 * @return           1 if found and remove, 0 otherwise
 */
-native rg_remove_item(const index, const item_name[]);
+native rg_remove_item(const index, const item_name[], const bool:removeAmmo = false);
 
 /*
 * Sets the amount of ammo in the client's backpack for a specific weapon.

diff --git a/reapi/include/cssdk/dlls/API/CSPlayer.h b/reapi/include/cssdk/dlls/API/CSPlayer.h
@@ -79,6 +79,7 @@ class CCSPlayer: public CCSMonster {
 	virtual bool MakeBomber();
 	virtual void ResetSequenceInfo();
 	virtual void StartDeathCam();
+	virtual bool RemovePlayerItemEx(const char* pszItemName, bool bRemoveAmmo);
 
 	CBasePlayer *BasePlayer() const;
 

diff --git a/reapi/include/cssdk/dlls/regamedll_api.h b/reapi/include/cssdk/dlls/regamedll_api.h
@@ -38,7 +38,7 @@
 #include <API/CSInterfaces.h>
 
 #define REGAMEDLL_API_VERSION_MAJOR 5
-#define REGAMEDLL_API_VERSION_MINOR 5
+#define REGAMEDLL_API_VERSION_MINOR 6
 
 // CBasePlayer::Spawn hook
 typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_Spawn;

diff --git a/reapi/msvc/reapi.vcxproj b/reapi/msvc/reapi.vcxproj
@@ -66,6 +66,11 @@
     <ClInclude Include="..\include\cssdk\dlls\activitymap.h" />
     <ClInclude Include="..\include\cssdk\dlls\airtank.h" />
     <ClInclude Include="..\include\cssdk\dlls\ammo.h" />
+    <ClInclude Include="..\include\cssdk\dlls\API\CSEntity.h" />
+    <ClInclude Include="..\include\cssdk\dlls\API\CSInterfaces.h" />
+    <ClInclude Include="..\include\cssdk\dlls\API\CSPlayer.h" />
+    <ClInclude Include="..\include\cssdk\dlls\API\CSPlayerItem.h" />
+    <ClInclude Include="..\include\cssdk\dlls\API\CSPlayerWeapon.h" />
     <ClInclude Include="..\include\cssdk\dlls\basemonster.h" />
     <ClInclude Include="..\include\cssdk\dlls\bmodels.h" />
     <ClInclude Include="..\include\cssdk\dlls\bot\cs_bot.h" />
@@ -371,10 +376,10 @@
       <Message>Force build to run Pre-Build event</Message>
     </CustomBuildStep>
     <CustomBuildStep>
-      <Outputs>subversion.always.run</Outputs>
+      <Outputs>build.always.run</Outputs>
     </CustomBuildStep>
     <CustomBuildStep>
-      <Inputs>subversion.always.run</Inputs>
+      <Inputs>build.always.run</Inputs>
     </CustomBuildStep>
     <PreBuildEvent>
       <Command>IF EXIST "$(ProjectDir)PreBuild.bat" (CALL "$(ProjectDir)PreBuild.bat" "$(ProjectDir)..\version\" "$(ProjectDir)..\")</Command>
@@ -419,10 +424,10 @@
       <Message>Force build to run Pre-Build event</Message>
     </CustomBuildStep>
     <CustomBuildStep>
-      <Outputs>subversion.always.run</Outputs>
+      <Outputs>build.always.run</Outputs>
     </CustomBuildStep>
     <CustomBuildStep>
-      <Inputs>subversion.always.run</Inputs>
+      <Inputs>build.always.run</Inputs>
     </CustomBuildStep>
     <PostBuildEvent>
       <Command>IF EXIST "$(ProjectDir)PostBuild.bat" (CALL "$(ProjectDir)PostBuild.bat" "$(TargetDir)" "$(TargetName)" "$(TargetExt)" "$(ProjectDir)")</Command>

diff --git a/reapi/src/natives/natives_misc.cpp b/reapi/src/natives/natives_misc.cpp
@@ -988,23 +988,24 @@ cell AMX_NATIVE_CALL rg_internal_cmd(AMX *amx, cell *params)
 *
 * @param index      Client index
 * @param item_name  Item classname
+* @param removeAmmo Remove ammunition
 *
 * @return           1 if found and remove, 0 otherwise
 *
-* native rg_remove_item(const index, const item_name[]);
+* native rg_remove_item(const index, const item_name[], const bool:removeAmmo = false);
 */
 cell AMX_NATIVE_CALL rg_remove_item(AMX *amx, cell *params)
 {
-	enum args_e { arg_count, arg_index, arg_item_name };
+	enum args_e { arg_count, arg_index, arg_item_name, arg_remammo };
 
 	CHECK_ISPLAYER(arg_index);
 
 	CBasePlayer *pPlayer = UTIL_PlayerByIndex(params[arg_index]);
 	CHECK_CONNECTED(pPlayer, arg_index);
 
 	char iname[256];
-	const char* szItemName = getAmxString(amx, params[arg_item_name], iname);
-	if (pPlayer->CSPlayer()->RemovePlayerItem(szItemName)) {
+	const char* pszItemName = getAmxString(amx, params[arg_item_name], iname);
+	if (pPlayer->CSPlayer()->RemovePlayerItemEx(pszItemName, params[arg_remammo] != 0)) {
 		return TRUE;
 	}