Fix for usehumananimations, sendprop optimize, anti stuck on players

Author: rafradek

src/mod/cond/reprogrammed.cpp

@@ -82,7 +82,7 @@ namespace Mod::Cond::Reprogrammed
 //		0x50,                               // +0000  push eax
 //		0xff, 0x15, 0xff, 0xff, 0xff, 0xff, // +0001  call [<STUB> CBaseEntity::IsBot]
 //		0x83, 0xC4, 0x10,                   // +0007  add esp, 10h
-//		0x90, 0x90,                         // +000a  nop nop
+//		0x84, 0xc0,                         // +000a  test al, al
 //		0x0f, 0x85, 0xa5, 0x01, 0x00, 0x00, // +000c  jnz +0x1a5
 //	};
 
@@ -118,9 +118,9 @@ namespace Mod::Cond::Reprogrammed
 			buf[0x02] = 0x15;
 			buf.SetDword(0x01 + 2, (uint32_t)&s_CBasePlayer_IsBot);
 
-			/* pad out extra space with NOPs */
-			buf[0x0a] = 0x90;
-			buf[0x0b] = 0x90;
+			/* test result */
+			buf[0x0a] = 0x84;
+			buf[0x0b] = 0xc0;
 
 			/* invert the jump condition code */
 			buf[0x0d] = 0x85;

src/mod/etc/unintended_class_weapon_improvements.cpp

@@ -105,6 +105,7 @@ namespace Mod::Etc::Unintended_Class_Weapon_Improvements
 			}
 
 			owner->GetPlayerClass()->SetCustomModel(mod->properPlayerModel);
+			owner->UpdateModel();
 			mod->overridePlayerAnimClassApplied = true;
 			owner->m_nRenderFX = 6;
 			auto wearable_player = CreateCustomWeaponModelPlaceholder(owner, weapon, mod->oldPlayerModel);
@@ -177,6 +178,7 @@ namespace Mod::Etc::Unintended_Class_Weapon_Improvements
 		if (mod->overridePlayerAnimClass != -1) {
 			mod->overridePlayerAnimClassApplied = false;
 			owner->GetPlayerClass()->SetCustomModel(mod->oldPlayerCustomModel.c_str());
+			owner->UpdateModel();
 			if (owner->IsAlive())
 				owner->m_nRenderFX = 0;
 		}

src/mod/perf/sendprop_optimize.cpp

@@ -1216,6 +1216,7 @@ namespace Mod::Perf::SendProp_Optimize
 
     DETOUR_DECL_STATIC(void, SV_ComputeClientPacks, int clientCount,  CGameClient **clients, CFrameSnapshot *snapshot)
 	{
+        // Do not network dead bots and reduce update rate for their weapons
         for (int i = 1; i <= gpGlobals->maxClients; i++) {
             edict_t *edict = world_edict + i;
             if (!edict->IsFree() /*&& edict->m_fStateFlags & (FL_EDICT_CHANGED | FL_FULL_EDICT_CHANGED)*/ && !(edict->m_fStateFlags & FL_EDICT_DONTSEND)) {
@@ -1244,6 +1245,7 @@ namespace Mod::Perf::SendProp_Optimize
             return;
         }
 
+        // Synchronous compute first
         for (int clientIndex = 0; clientIndex < clientCount; clientIndex ++) {
             computedPackInfos[clientIndex] = false;
             checkTransmitComplete[clientIndex] = false;
@@ -1264,6 +1266,10 @@ namespace Mod::Perf::SendProp_Optimize
         int packWorkTaskCount = (int) threadPoolPackWork.get_thread_count();
         CFrameSnapshotManager &snapmgr = g_FrameSnapshotManager;
 
+        std::vector<edict_t *> *entitiesWithNotUpdatedChangedProps = new std::vector<edict_t *>[packWorkTaskCount];
+        std::vector<edict_t *> *entitiesWithNotUpdatedFullyChangedProps = new std::vector<edict_t *>[packWorkTaskCount];
+
+        // Threaded networking starts here
         threadPool.push_task([&](){
             for (int clientIndex = 0; clientIndex < clientCount; clientIndex ++) {
                 auto client = clients[clientIndex];
@@ -1278,14 +1284,22 @@ namespace Mod::Perf::SendProp_Optimize
 
             for (int i = 0; i < packWorkTaskCount; i++) {
                 threadPoolPackWork.push_task([&](int num){
+                    entitiesWithNotUpdatedChangedProps[num].reserve(8);
+                    entitiesWithNotUpdatedFullyChangedProps[num].reserve(2);
                     size_t workEntryCount = snapshot->m_nValidEntities/packWorkTaskCount+1;
                     PackWork_t *workEntities = (PackWork_t *) operator new[](workEntryCount * sizeof(PackWork_t));
                     size_t workEntitiesCount = 0;
                     for (int i = num; i < snapshot->m_nValidEntities; i += packWorkTaskCount) {
                         int idx = snapshot->m_pValidEntities[i];
                         auto edict = world_edict + idx;
+                        // Don't update props for non networked entities
                         if ((edict->m_fStateFlags & FL_EDICT_DONTSEND) && ((CBaseEntity *)edict->GetUnknown())->FirstMoveChild() == nullptr 
                             && snapmgr.UsePreviouslySentPacket(snapshot, idx, edict->m_NetworkSerialNumber)) {
+
+                            if (edict->m_fStateFlags & FL_FULL_EDICT_CHANGED)
+                                entitiesWithNotUpdatedFullyChangedProps->push_back(edict);
+                            else if (edict->m_fStateFlags & FL_EDICT_CHANGED)
+                                entitiesWithNotUpdatedChangedProps->push_back(edict);
                             continue;
                         } 
                         PackWork_t &work = workEntities[workEntitiesCount++];
@@ -1350,6 +1364,16 @@ namespace Mod::Perf::SendProp_Optimize
             edict->m_fStateFlags &= ~(FL_FULL_EDICT_CHANGED|FL_EDICT_CHANGED);
         }
 
+        for (int i = 0; i < packWorkTaskCount; i++) {
+            for (auto edict : entitiesWithNotUpdatedChangedProps[i]) {
+                edict->m_fStateFlags |= FL_EDICT_CHANGED;
+            }
+
+            for (auto edict : entitiesWithNotUpdatedFullyChangedProps[i]) {
+                edict->m_fStateFlags |= (FL_EDICT_CHANGED | FL_FULL_EDICT_CHANGED);
+            }
+        }
+
         threadPool.wait_for_tasks();
         threadPoolPackWork.wait_for_tasks();
 

src/mod/pop/ecattr_extensions.cpp

@@ -267,6 +267,7 @@ namespace Mod::Pop::ECAttr_Extensions
 				if (wearable != nullptr && wearable->GetCustomVariableBool<"humananimation">()) {
 					int model_index = wearable->m_nModelIndexOverrides[0];
 					bot->GetPlayerClass()->SetCustomModel(modelinfo->GetModelName(modelinfo->GetModel(model_index)), true);
+					bot->UpdateModel();
 					wearable->Remove();
 				}
 			}
@@ -1272,6 +1273,7 @@ namespace Mod::Pop::ECAttr_Extensions
 					wearable->SetModelIndexOverride(j, model_index);
 				}
 				bot->GetPlayerClass()->SetCustomModel(nullptr, true);
+				bot->UpdateModel();
 				wearable->SetCustomVariable("humananimation", Variant(true));
 				THINK_FUNC_SET(wearable, UpdateBodySkinPlayerWearable, gpGlobals->curtime);
 			}

src/mod/pop/popmgr_extensions.cpp

@@ -2511,6 +2511,7 @@ namespace Mod::Pop::PopMgr_Extensions
 				if (find->second != nullptr) {
 					int model_index = find->second->m_nModelIndexOverrides[0];
 					player->GetPlayerClass()->SetCustomModel(modelinfo->GetModelName(modelinfo->GetModel(model_index)), true);
+					player->UpdateModel();
 					find->second->Remove();
 				}
 			}