sm-exts/proxysend
1
0
Fork 0
mirror of https://github.com/arthurdead/proxysend.git synced 2025-12-07 10:28:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some stuff

Browse Source
This commit is contained in:
arthurdead 2022-05-21 01:02:41 -03:00
parent d2d8678821
commit e6667807e1
1 changed files with 38 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
extension.cpp
View File

@ -1271,8 +1271,7 @@ DETOUR_DECL_STATIC6(SendTable_Encode, bool, const SendTable *, pTable, const voi
} }
{ {
bool encoded{DETOUR_STATIC_CALL(SendTable_Encode)(pTable, pStruct, pOut, objectID, pRecipients, bNonZeroOnly)}; if(!DETOUR_STATIC_CALL(SendTable_Encode)(pTable, pStruct, pOut, objectID, pRecipients, bNonZeroOnly)) {
if(!encoded) {
Host_Error( "SV_PackEntity: SendTable_Encode returned false (ent %d).\n", objectID ); Host_Error( "SV_PackEntity: SendTable_Encode returned false (ent %d).\n", objectID );
return false; return false;
} }
@ -1281,21 +1280,24 @@ DETOUR_DECL_STATIC6(SendTable_Encode, bool, const SendTable *, pTable, const voi
const std::vector<int> &entities{packentity_params->entities}; const std::vector<int> &entities{packentity_params->entities};
if(std::find(entities.cbegin(), entities.cend(), objectID) != entities.cend()) { if(std::find(entities.cbegin(), entities.cend(), objectID) != entities.cend()) {
for(int i{0}; i < packentity_params->slots.size(); ++i) { const std::size_t slots_size{packentity_params->slots.size()};
for(int i{0}; i < slots_size; ++i) {
packed_entity_data_t &packedData{packentity_params->entity_data[i].emplace_back()}; packed_entity_data_t &packedData{packentity_params->entity_data[i].emplace_back()};
packedData.objectID = objectID; packedData.objectID = objectID;
packedData.allocate(); packedData.allocate();
sendproxy_client_slot = packentity_params->slots[i]; sendproxy_client_slot = packentity_params->slots[i];
bool encoded{DETOUR_STATIC_CALL(SendTable_Encode)(pTable, pStruct, packedData.writeBuf.get(), objectID, pRecipients, bNonZeroOnly)}; const bool encoded{DETOUR_STATIC_CALL(SendTable_Encode)(pTable, pStruct, packedData.writeBuf.get(), objectID, pRecipients, bNonZeroOnly)};
sendproxy_client_slot = nullptr; sendproxy_client_slot = nullptr;
if(!encoded) { if(!encoded) {
Host_Error( "SV_PackEntity: SendTable_Encode returned false (ent %d).\n", objectID ); Host_Error( "SV_PackEntity: SendTable_Encode returned false (ent %d).\n", objectID );
return false; return false;
} }
} }
do_calc_delta = true; if(slots_size > 0) {
do_calc_delta = true;
}
} }
return true; return true;
@ -1312,8 +1314,6 @@ DETOUR_DECL_STATIC8(SendTable_CalcDelta, int, const SendTable *, pTable, const v
int global_nChanges{DETOUR_STATIC_CALL(SendTable_CalcDelta)(pTable, pFromState, nFromBits, pToState, nToBits, pDeltaProps, nMaxDeltaProps, objectID)}; int global_nChanges{DETOUR_STATIC_CALL(SendTable_CalcDelta)(pTable, pFromState, nFromBits, pToState, nToBits, pDeltaProps, nMaxDeltaProps, objectID)};
if(do_calc_delta) { if(do_calc_delta) {
bool any_changed{global_nChanges > 0};
if(global_nChanges < nMaxDeltaProps) { if(global_nChanges < nMaxDeltaProps) {
std::unique_ptr<int[]> client_deltaProps{new int[nMaxDeltaProps]{static_cast<unsigned int>(-1)}}; std::unique_ptr<int[]> client_deltaProps{new int[nMaxDeltaProps]{static_cast<unsigned int>(-1)}};
@ -1322,6 +1322,8 @@ DETOUR_DECL_STATIC8(SendTable_CalcDelta, int, const SendTable *, pTable, const v
const int client_nChanges{DETOUR_STATIC_CALL(SendTable_CalcDelta)(pTable, pFromState, nFromBits, packedData.packedData.get(), packedData.writeBuf->GetNumBitsWritten(), client_deltaProps.get(), nMaxDeltaProps, objectID)}; const int client_nChanges{DETOUR_STATIC_CALL(SendTable_CalcDelta)(pTable, pFromState, nFromBits, packedData.packedData.get(), packedData.writeBuf->GetNumBitsWritten(), client_deltaProps.get(), nMaxDeltaProps, objectID)};
bool done{false};
for(int j{0}; j < client_nChanges; ++j) { for(int j{0}; j < client_nChanges; ++j) {
bool found{false}; bool found{false};
for(int k{0}; k < global_nChanges; ++k) { for(int k{0}; k < global_nChanges; ++k) {
@ -1331,27 +1333,19 @@ DETOUR_DECL_STATIC8(SendTable_CalcDelta, int, const SendTable *, pTable, const v
} }
} }
if(!found) { if(!found) {
any_changed = true;
pDeltaProps[global_nChanges++] = client_deltaProps[j]; pDeltaProps[global_nChanges++] = client_deltaProps[j];
if(global_nChanges >= nMaxDeltaProps) { if(global_nChanges >= nMaxDeltaProps) {
done = true;
break; break;
} }
} }
} }
if(global_nChanges >= nMaxDeltaProps) { if(done) {
break; break;
} }
} }
} }
if(any_changed) {
edict_t *edict{gamehelpers->EdictOfIndex(objectID)};
if(edict) {
edict->m_fStateFlags |= FL_EDICT_CHANGED;
}
}
do_calc_delta = nullptr; do_calc_delta = nullptr;
} }
@ -1511,68 +1505,60 @@ DETOUR_DECL_STATIC3(SV_ComputeClientPacks, void, int, clientCount, CGameClient *
bool any_hook{false}; bool any_hook{false};
if(!slots.empty()) { const hooks_t &chooks{hooks};
const hooks_t &chooks{hooks};
if(!slots.empty()) {
entities.reserve(snapshot->m_nValidEntities); entities.reserve(snapshot->m_nValidEntities);
for(int i{0}; i < snapshot->m_nValidEntities; ++i) { }
hooks_t::const_iterator it_hook{chooks.find(snapshot->m_pValidEntities[i])};
if(it_hook != chooks.cend()) { for(int i{0}; i < snapshot->m_nValidEntities; ++i) {
if(!it_hook->second.callbacks.empty()) { hooks_t::const_iterator it_hook{chooks.find(snapshot->m_pValidEntities[i])};
any_hook = true; if(it_hook != chooks.cend()) {
if(!it_hook->second.callbacks.empty()) {
any_hook = true;
if(slots.empty()) {
break;
} }
bool any_per_client{false}; }
if(!slots.empty()) {
bool any_per_client_func{false};
for(const auto &it_callback : it_hook->second.callbacks) { for(const auto &it_callback : it_hook->second.callbacks) {
if(it_callback.second.has_any_per_client_func()) { if(it_callback.second.has_any_per_client_func()) {
any_per_client = true; any_per_client_func = true;
break; break;
} }
} }
if(any_per_client) { if(any_per_client_func) {
entities.emplace_back(snapshot->m_pValidEntities[i]); entities.emplace_back(snapshot->m_pValidEntities[i]);
} }
} }
} }
} else {
const hooks_t &chooks{hooks};
for(int i{0}; i < snapshot->m_nValidEntities; ++i) {
hooks_t::const_iterator it_hook{chooks.find(snapshot->m_pValidEntities[i])};
if(it_hook != chooks.cend()) {
if(!it_hook->second.callbacks.empty()) {
any_hook = true;
break;
}
}
}
} }
sv_parallel_sendsnapshot->SetValue(true); sv_parallel_sendsnapshot->SetValue(true);
if(!slots.empty() && !entities.empty()) { const bool any_per_client_hook{!slots.empty() && !entities.empty()};
if(any_per_client_hook) {
packentity_params.reset(new pack_entity_params_t{std::move(slots), std::move(entities), snapshot->m_ListIndex}); packentity_params.reset(new pack_entity_params_t{std::move(slots), std::move(entities), snapshot->m_ListIndex});
SendTable_Encode_detour->EnableDetour();
SendTable_CalcDelta_detour->EnableDetour();
CBaseServer_WriteDeltaEntities_detour->EnableDetour(); CBaseServer_WriteDeltaEntities_detour->EnableDetour();
CFrameSnapshotManager_GetPackedEntity_detour->EnableDetour(); CFrameSnapshotManager_GetPackedEntity_detour->EnableDetour();
} else { } else {
CBaseServer_WriteDeltaEntities_detour->DisableDetour(); CBaseServer_WriteDeltaEntities_detour->DisableDetour();
CFrameSnapshotManager_GetPackedEntity_detour->DisableDetour(); CFrameSnapshotManager_GetPackedEntity_detour->DisableDetour();
}
sv_parallel_packentities->SetValue(!any_hook);
if(any_hook) {
SendTable_Encode_detour->EnableDetour();
SendTable_CalcDelta_detour->EnableDetour();
} else {
SendTable_Encode_detour->DisableDetour(); SendTable_Encode_detour->DisableDetour();
SendTable_CalcDelta_detour->DisableDetour(); SendTable_CalcDelta_detour->DisableDetour();
} }
sv_parallel_packentities->SetValue(!any_hook);
in_compute_packs = true; in_compute_packs = true;
DETOUR_STATIC_CALL(SV_ComputeClientPacks)(clientCount, clients, snapshot); DETOUR_STATIC_CALL(SV_ComputeClientPacks)(clientCount, clients, snapshot);
in_compute_packs = false; in_compute_packs = false;
if(!sv_parallel_packentities->GetBool() && any_hook) { if(!sv_parallel_packentities->GetBool() && any_per_client_hook) {
SendTable_Encode_detour->DisableDetour(); SendTable_Encode_detour->DisableDetour();
SendTable_CalcDelta_detour->DisableDetour(); SendTable_CalcDelta_detour->DisableDetour();
} }
@ -1906,13 +1892,15 @@ bool Sample::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool l
void Sample::OnCoreMapEnd() noexcept void Sample::OnCoreMapEnd() noexcept
{ {
hooks.clear();
tables.clear(); tables.clear();
restores.clear(); restores.clear();
hooks.clear();
} }
void Sample::SDK_OnUnload() noexcept void Sample::SDK_OnUnload() noexcept
{ {
OnCoreMapEnd();
SendTable_CalcDelta_detour->Destroy(); SendTable_CalcDelta_detour->Destroy();
SendTable_Encode_detour->Destroy(); SendTable_Encode_detour->Destroy();
SV_ComputeClientPacks_detour->Destroy(); SV_ComputeClientPacks_detour->Destroy();
@ -1923,10 +1911,6 @@ void Sample::SDK_OnUnload() noexcept
CFrameSnapshotManager_GetPackedEntity_detour->Destroy(); CFrameSnapshotManager_GetPackedEntity_detour->Destroy();
CBaseServer_WriteDeltaEntities_detour->Destroy(); CBaseServer_WriteDeltaEntities_detour->Destroy();
tables.clear();
restores.clear();
hooks.clear();
gameconfs->CloseGameConfigFile(gameconf); gameconfs->CloseGameConfigFile(gameconf);
smutils->RemoveGameFrameHook(game_frame); smutils->RemoveGameFrameHook(game_frame);