[ FIX ] Compiling in release mode caused crash on CAnimBlendAssoc_destructor

codenulls · codenulls · commit d38b4ecd7165 · 2018-04-01T15:31:49.000+05:00
diff --git a/Client/multiplayer_sa/CMultiplayerSA_CustomAnimations.cpp b/Client/multiplayer_sa/CMultiplayerSA_CustomAnimations.cpp
@@ -53,7 +53,7 @@ void CMultiplayerSA::SetBlendAnimationHierarchyHandler ( BlendAnimationHierarchy
     m_pBlendAnimationHierarchyHandler = pHandler;
 }
 
-void CAnimBlendAssoc_destructor ( CAnimBlendAssociationSAInterface * pThis )
+void __cdecl CAnimBlendAssoc_destructor ( CAnimBlendAssociationSAInterface * pThis )
 {
     if ( m_pCAnimBlendAssocDestructorHandler )
     {
@@ -65,9 +65,14 @@ void _declspec(naked) HOOK_CAnimBlendAssoc_destructor ()
 {
     _asm
     {
-        push    ecx  // this
+        push    ecx 
+        
+        push    ecx 
         call    CAnimBlendAssoc_destructor
+        add     esp, 0x4
+
         pop     ecx
+
         push    esi
         mov     esi, ecx
         mov     eax, [esi+10h]

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void CMultiplayerSA::SetBlendAnimationHierarchyHandler ( BlendAnimationHierarchy`
`53`	`53`	`m_pBlendAnimationHierarchyHandler = pHandler;`
`54`	`54`	`}`
`55`	`55`
`56`		`-void CAnimBlendAssoc_destructor ( CAnimBlendAssociationSAInterface * pThis )`
	`56`	`+void __cdecl CAnimBlendAssoc_destructor ( CAnimBlendAssociationSAInterface * pThis )`
`57`	`57`	`{`
`58`	`58`	`if ( m_pCAnimBlendAssocDestructorHandler )`
`59`	`59`	`{`
`@@ -65,9 +65,14 @@ void _declspec(naked) HOOK_CAnimBlendAssoc_destructor ()`
`65`	`65`	`{`
`66`	`66`	`_asm`
`67`	`67`	`{`
`68`		`- push ecx // this`
	`68`	`+ push ecx`
	`69`	`+`
	`70`	`+ push ecx`
`69`	`71`	`call CAnimBlendAssoc_destructor`
	`72`	`+ add esp, 0x4`
	`73`	`+`
`70`	`74`	`pop ecx`
	`75`	`+`
`71`	`76`	`push esi`
`72`	`77`	`mov esi, ecx`
`73`	`78`	`mov eax, [esi+10h]`