cambio a bool

Nostalgia-Gamers · Jan 4, 2024 · 403716d · 403716d
1 parent a62e68e
commit 403716d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/reapi/extra/amxmodx/scripting/include/reapi.inc b/reapi/extra/amxmodx/scripting/include/reapi.inc
@@ -136,7 +136,8 @@ enum AType
 	ATYPE_EVARS,
 	ATYPE_BOOL,
 	ATYPE_VECTOR,
-	ATYPE_TRACE
+	ATYPE_TRACE,
+	ATYPE_ITEMINFO
 };
 
 enum HookChain

diff --git a/reapi/include/cssdk/dlls/regamedll_api.h b/reapi/include/cssdk/dlls/regamedll_api.h
@@ -623,8 +623,8 @@ typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_PlayerD
 typedef IHookChainRegistryClass<void, class CBasePlayer> IReGameHookRegistry_CBasePlayer_PlayerDeathThink;
 
 // PrecacheItemInfo hook
-typedef IHookChain<void, ItemInfo *> IReGameHook_PrecacheItemInfo;
-typedef IHookChainRegistry<void, ItemInfo *> IReGameHookRegistry_PrecacheItemInfo;
+typedef IHookChain<bool, ItemInfo *> IReGameHook_PrecacheItemInfo;
+typedef IHookChainRegistry<bool, ItemInfo *> IReGameHookRegistry_PrecacheItemInfo;
 
 class IReGameHookchains {
 public:

diff --git a/reapi/src/hook_callback.cpp b/reapi/src/hook_callback.cpp
@@ -1610,14 +1610,14 @@ void BuyItem(IReGameHook_BuyItem *chain, CBasePlayer *pPlayer, int iSlot)
 	callVoidForward(RG_BuyItem, original, indexOfEdict(pPlayer->pev), iSlot);
 }
 
-void PrecacheItemInfo(IReGameHook_PrecacheItemInfo *chain, ItemInfo *info)
+bool PrecacheItemInfo(IReGameHook_PrecacheItemInfo *chain, ItemInfo *info)
 {
 	auto original = [chain](ItemInfo* _info)
 	{
-		chain->callNext(_info);
+		return chain->callNext(_info);
 	};
 
-	callVoidForward(RG_PrecacheItemInfo, original, info);
+	return callForward<bool>(RG_PrecacheItemInfo, original, info);
 }
 
 void CSGameRules_Think(IReGameHook_CSGameRules_Think *chain)

diff --git a/reapi/src/hook_callback.h b/reapi/src/hook_callback.h
@@ -550,7 +550,7 @@ void ClearMultiDamage(IReGameHook_ClearMultiDamage *chain);
 void AddMultiDamage(IReGameHook_AddMultiDamage *chain, entvars_t *pevInflictor, CBaseEntity *pEntity, float flDamage, int bitsDamageType);
 void ApplyMultiDamage(IReGameHook_ApplyMultiDamage *chain, entvars_t *pevInflictor, entvars_t *pevAttacker);
 void BuyItem(IReGameHook_BuyItem *chain, CBasePlayer *pPlayer, int iSlot);
-void PrecacheItemInfo(IReGameHook_PrecacheItemInfo* chain, ItemInfo* info);
+bool PrecacheItemInfo(IReGameHook_PrecacheItemInfo* chain, ItemInfo* info);
 void CSGameRules_Think(IReGameHook_CSGameRules_Think *chain);
 BOOL CSGameRules_TeamFull(IReGameHook_CSGameRules_TeamFull *chain, int team_id);
 BOOL CSGameRules_TeamStacked(IReGameHook_CSGameRules_TeamStacked *chain, int newTeam_id, int curTeam_id);

diff --git a/reapi/src/member_list.cpp b/reapi/src/member_list.cpp
@@ -117,7 +117,6 @@ inline MType getMemberType(SecondaryAtkState)   { return MEMBER_INTEGER; }
 inline MType getMemberType(netadrtype_t)        { return MEMBER_INTEGER; }
 
 inline MType getMemberType(TraceResult)         { return MEMBER_TRACERESULT; }
-inline MType getMemberType(ItemInfo)            { return MEMBER_ITEMINFO; }
 
 inline MType getMemberType(short)               { return MEMBER_SHORT; }
 inline MType getMemberType(unsigned short)      { return MEMBER_SHORT; }

diff --git a/reapi/src/member_list.h b/reapi/src/member_list.h
@@ -26,7 +26,6 @@ enum MType
 	MEMBER_PMTRACE,			// struct pmtrace_t
 	MEBMER_USERCMD,			// struct usercmd_s
 	MEMBER_TRACERESULT,		// struct TraceResult
-	MEMBER_ITEMINFO,        // struct ItemInfo
 };
 
 struct memberlist_t
@@ -123,7 +122,6 @@ struct member_t
 		case MEMBER_PMTRACE:     return "pmtrace";
 		case MEBMER_USERCMD:     return "usercmd";
 		case MEMBER_TRACERESULT: return "TraceResult";
-		case MEMBER_ITEMINFO:    return "ItemInfo";
 		default:
 		{
 			static char string[16];

diff --git a/reapi/src/natives/natives_members.cpp b/reapi/src/natives/natives_members.cpp
@@ -989,7 +989,6 @@ cell set_member(AMX *amx, void* pdata, const member_t *member, cell* value, size
 	case MEBMER_REBUYSTRUCT:
 	case MEMBER_PMTRACE:
 	case MEBMER_USERCMD:
-	case MEMBER_ITEMINFO:
 		AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: member type %s (%s) is not supported", __FUNCTION__, member_t::getTypeString(member->type), member->name);
 		return FALSE;
 	default: break;
@@ -1126,8 +1125,6 @@ cell get_member(AMX *amx, void* pdata, const member_t *member, cell* dest, size_
 		return (cell)get_member_direct<pmtrace_s>(pdata, member->offset, element);
 	case MEBMER_USERCMD:
 		return (cell)get_member_direct<usercmd_s>(pdata, member->offset, element);
-	case MEMBER_ITEMINFO:
-		return (cell)get_member_direct<ItemInfo>(pdata, member->offset, element);
 	default: break;
 	}
 

diff --git a/reapi/src/reapi_utils.cpp b/reapi/src/reapi_utils.cpp
@@ -321,7 +321,8 @@ const char *getATypeStr(AType type)
 		"ATYPE_EVARS",
 		"ATYPE_BOOL",
 		"ATYPE_VECTOR",
-		"ATYPE_TRACE"
+		"ATYPE_TRACE",
+		"ATYPE_ITEMINFO"
 	};
 
 	if (type >= arraysize(s_ATypes))