Re-add dhooks crash fix (not fixed yet)

Alienmario · Alienmario · commit ac06f2ff6173 · 2024-12-12T18:16:24.000+01:00
diff --git a/gamedata/modelchooser.txt b/gamedata/modelchooser.txt
@@ -4,7 +4,7 @@
 	{
 		"Functions"
 		{
-			"CBaseEntity::SetModel"
+			"CBaseEntity::SetModel_" // https://github.com/alliedmodders/sourcemod/issues/1879
 			{
 				"offset"	"CBaseEntity::SetModel"
 				"hooktype"	"entity"
diff --git a/scripting/ultimate_modelchooser.sp b/scripting/ultimate_modelchooser.sp
@@ -100,7 +100,7 @@ public void OnPluginStart()
 		SetFailState("Failed to load \"modelchooser\" gamedata");
 	}
 
-	LoadDHookVirtual(gamedata, hkSetModel, "CBaseEntity::SetModel");
+	LoadDHookVirtual(gamedata, hkSetModel, "CBaseEntity::SetModel_");
 	LoadDHookVirtual(gamedata, hkDeathSound, "CBasePlayer::DeathSound");
 	LoadDHookVirtual(gamedata, hkSetAnimation, "CBasePlayer::SetAnimation");
 	

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`{`
`5`	`5`	`"Functions"`
`6`	`6`	`{`
`7`		`- "CBaseEntity::SetModel"`
	`7`	`+ "CBaseEntity::SetModel_" // https://github.com/alliedmodders/sourcemod/issues/1879`
`8`	`8`	`{`
`9`	`9`	`"offset" "CBaseEntity::SetModel"`
`10`	`10`	`"hooktype" "entity"`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public void OnPluginStart()`
`100`	`100`	`SetFailState("Failed to load \"modelchooser\" gamedata");`
`101`	`101`	`}`
`102`	`102`
`103`		`- LoadDHookVirtual(gamedata, hkSetModel, "CBaseEntity::SetModel");`
	`103`	`+ LoadDHookVirtual(gamedata, hkSetModel, "CBaseEntity::SetModel_");`
`104`	`104`	`LoadDHookVirtual(gamedata, hkDeathSound, "CBasePlayer::DeathSound");`
`105`	`105`	`LoadDHookVirtual(gamedata, hkSetAnimation, "CBasePlayer::SetAnimation");`
`106`	`106`