Merge remote-tracking branch 'refs/remotes/origin/development'

Nukem9 · Sep 24, 2016 · c6b48c4 · c6b48c4
2 parents df3da49 + 1e421d7
commit c6b48c4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/components/game_mod/CEG.cpp b/components/game_mod/CEG.cpp
@@ -49,6 +49,8 @@ void Patch_CEG()
 	Detours::X86::DetourFunction((PBYTE)0x8EF04F, (PBYTE)&hk_inline_memcpy);
 	Detours::X86::DetourFunction((PBYTE)0x8EF168, (PBYTE)&hk_inline_memcpy2);
 
+	Detours::X86::DetourFunction((PBYTE)0x8EE640, (PBYTE)&sub_8EE640);
+
 	FixupFunction(0x0060CC10, 0x004F20F0);// CEGObfuscate<LiveStats_Init> => LiveStats_Init
 	FixupFunction(0x00580460, 0x0079E6D0);// CEGObfuscate<Con_Restricted_SetLists> => Con_Restricted_SetLists
 }
@@ -119,6 +121,15 @@ void __declspec(naked) hk_inline_memcpy2()
 	}
 }
 
+void *sub_8EE640(void *Nullptr1, void *Nullptr2)
+{
+	if (Nullptr1 != nullptr || Nullptr2 != nullptr)
+		__debugbreak();
+
+	*(void **)0xBA1C24 = Nullptr2;
+	return (void *)0xBA1C24;
+}
+
 void __fastcall sub_5CBF00(void *thisptr, PVOID _EDX, DWORD address, size_t scanSize)
 {
 	DWORD dwNew = GetNewAddress(address);

diff --git a/components/game_mod/CEG.h b/components/game_mod/CEG.h
@@ -6,6 +6,8 @@ void hk_inline_memcpy();
 void hk_inline_memcpy2();
 void *hk_memcpy(void *dest, const void *src, size_t size);
 
+void *sub_8EE640(void *Nullptr1, void *Nullptr2);
+
 void __fastcall sub_5CBF00(void *thisptr, PVOID _EDX, DWORD address, size_t scanSize);
 void __fastcall sub_661450(void *thisptr, PVOID _EDX, DWORD address, size_t scanSize);
 void __fastcall sub_4E9880(void *thisptr, PVOID _EDX, DWORD address, size_t scanSize);

diff --git a/components/game_mod/dvar.cpp b/components/game_mod/dvar.cpp
@@ -37,7 +37,8 @@ void R_RegisterCustomDvars()
 	if (r_noborder->current.enabled)
 		style = WS_VISIBLE | WS_POPUP;
 
-	PatchMemory(0x006B7A74, (PBYTE)&style, sizeof(DWORD));
+	PatchMemory(0x006B7A74, (PBYTE)&style, sizeof(DWORD));// R_CreateWindow
+	PatchMemory(0x006B7EC1, (PBYTE)&style, sizeof(DWORD));// R_ResizeWindow
 }
 
 void* rtn_R_RegisterDvars = (void*)0x006CA283;