diff options
author | Kissaki <kissaki@gmx.de> | 2013-05-01 14:44:35 +0400 |
---|---|---|
committer | Kissaki <kissaki@gmx.de> | 2013-06-12 01:03:30 +0400 |
commit | f8f4b0fdec6b1336f59ad70804390af99fc0f698 (patch) | |
tree | 33acca21f69cf052861227dcaacbf84cf180d473 /overlay | |
parent | 11d5305f69d88b38c8e9369e1b772a03a2a44c13 (diff) |
refacs: more elaborative Varnaming; codeformatting
Diffstat (limited to 'overlay')
-rw-r--r-- | overlay/d3d10.cpp | 8 | ||||
-rw-r--r-- | overlay/d3d9.cpp | 20 | ||||
-rw-r--r-- | overlay/opengl.cpp | 8 |
3 files changed, 18 insertions, 18 deletions
diff --git a/overlay/d3d10.cpp b/overlay/d3d10.cpp index 13fab7d39..d179b4d3e 100644 --- a/overlay/d3d10.cpp +++ b/overlay/d3d10.cpp @@ -552,8 +552,8 @@ static void HookResizeRaw(voidFunc vfResize) { } void checkDXGIHook(bool preonly) { - static bool bCHActive = false; - if (bCHActive) { + static bool bCheckHookActive = false; + if (bCheckHookActive) { ods("D3D10: Recursion in checkDXGIHook"); return; } @@ -561,7 +561,7 @@ void checkDXGIHook(bool preonly) { if (! dxgi->iOffsetPresent || ! dxgi->iOffsetResize) return; - bCHActive = true; + bCheckHookActive = true; HMODULE hDXGI = GetModuleHandleW(L"DXGI.DLL"); HMODULE hD3D10 = GetModuleHandleW(L"D3D10CORE.DLL"); @@ -598,7 +598,7 @@ void checkDXGIHook(bool preonly) { } } - bCHActive = false; + bCheckHookActive = false; } extern "C" __declspec(dllexport) void __cdecl PrepareDXGI() { diff --git a/overlay/d3d9.cpp b/overlay/d3d9.cpp index 2773f4a06..9ac1165b1 100644 --- a/overlay/d3d9.cpp +++ b/overlay/d3d9.cpp @@ -34,8 +34,8 @@ Direct3D9Data *d3dd = NULL; -typedef IDirect3D9*(WINAPI *pDirect3DCreate9)(UINT SDKVersion) ; -typedef HRESULT(WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **ppD3D) ; +typedef IDirect3D9* (WINAPI *pDirect3DCreate9)(UINT SDKVersion) ; +typedef HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **ppD3D) ; struct D3DTLVERTEX { float x, y, z, rhw; // Position @@ -739,13 +739,13 @@ void hookD3D9(HMODULE hD3D, bool preonly); // patch Direct3DCreate9. // Should be true on PROC_ATTACH, and false on THREAD_ATTACH. (?) void checkD3D9Hook(bool preonly) { - static bool bCHActive = false; - if (bCHActive) { + static bool bCheckHookActive = false; + if (bCheckHookActive) { ods("D3D9: Recursion in checkD3D9Hook"); return; } - bCHActive = true; + bCheckHookActive = true; HMODULE hD3D = GetModuleHandle("D3D9.DLL"); @@ -755,7 +755,7 @@ void checkD3D9Hook(bool preonly) { } } - bCHActive = false; + bCheckHookActive = false; } void hookD3D9(HMODULE hD3D, bool preonly) { @@ -779,11 +779,11 @@ void hookD3D9(HMODULE hD3D, bool preonly) { } else if (! preonly) { ods("D3D9: Interface changed, can't rawpatch"); - pDirect3DCreate9 d3dc9 = reinterpret_cast<pDirect3DCreate9>(GetProcAddress(hD3D, "Direct3DCreate9")); - if (d3dc9) { - ods("D3D9: Got %p for Direct3DCreate9", d3dc9); + pDirect3DCreate9 d3dcreate9 = reinterpret_cast<pDirect3DCreate9>(GetProcAddress(hD3D, "Direct3DCreate9")); + if (d3dcreate9) { + ods("D3D9: Got %p for Direct3DCreate9", d3dcreate9); - IDirect3D9 *id3d9 = d3dc9(D3D_SDK_VERSION); + IDirect3D9 *id3d9 = d3dcreate9(D3D_SDK_VERSION); if (id3d9) { HookCreate(id3d9); id3d9->Release(); diff --git a/overlay/opengl.cpp b/overlay/opengl.cpp index b482844cc..89dcc5e8d 100644 --- a/overlay/opengl.cpp +++ b/overlay/opengl.cpp @@ -367,13 +367,13 @@ static BOOL __stdcall mywglSwapLayerBuffers(HDC hdc, UINT fuPlanes) { #define GLDEF(name) o##name = reinterpret_cast<t##name>(GetProcAddress(hGL, #name)) void checkOpenGLHook() { - static bool bCHActive = false; - if (bCHActive) { + static bool bCheckHookActive = false; + if (bCheckHookActive) { ods("Recursion in checkOpenGLHook"); return; } - bCHActive = true; + bCheckHookActive = true; HMODULE hGL = GetModuleHandle("OpenGL32.DLL"); @@ -431,5 +431,5 @@ void checkOpenGLHook() { } } - bCHActive = false; + bCheckHookActive = false; } |