From 20ae009d9b6e9407ffdda23b08cdcc0e2588fc43 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Mon, 11 Jan 2010 20:00:01 -0800
Subject: [PATCH] Fixed CallClass<T> source code compatibility bug in
 core-legacy (bug 4021, r=ds).

---
 core-legacy/sourcehook/generate/sourcehook.h   | 2 +-
 core-legacy/sourcehook/generate/sourcehook.hxx | 2 +-
 core-legacy/sourcehook/sourcehook.h            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core-legacy/sourcehook/generate/sourcehook.h b/core-legacy/sourcehook/generate/sourcehook.h
index e98bf42..cc93900 100644
--- a/core-legacy/sourcehook/generate/sourcehook.h
+++ b/core-legacy/sourcehook/generate/sourcehook.h
@@ -5204,7 +5204,7 @@ namespace SourceHook
 	MemFuncInfo mfi = {true, -1, 0, 0}; \
 	GetFuncInfo(CCW<Y>::GRP(ptr), mfp, mfi); \
 	void *vfnptr = reinterpret_cast<void*>( \
-		*reinterpret_cast<void***>(reinterpret_cast<char*>(ptr) + mfi.thisptroffs + mfi.vtbloffs) + mfi.vtblindex);
+		*reinterpret_cast<void***>(reinterpret_cast<char*>(CCW<Y>::GRP(ptr)) + mfi.thisptroffs + mfi.vtbloffs) + mfi.vtblindex);
 
 #define SH__CALL_GET_VFNPTR_MANUAL \
 	using namespace ::SourceHook; \
diff --git a/core-legacy/sourcehook/generate/sourcehook.hxx b/core-legacy/sourcehook/generate/sourcehook.hxx
index bf78003..c1852c6 100755
--- a/core-legacy/sourcehook/generate/sourcehook.hxx
+++ b/core-legacy/sourcehook/generate/sourcehook.hxx
@@ -1370,7 +1370,7 @@ namespace SourceHook
 	MemFuncInfo mfi = {true, -1, 0, 0}; \
 	GetFuncInfo(CCW<Y>::GRP(ptr), mfp, mfi); \
 	void *vfnptr = reinterpret_cast<void*>( \
-		*reinterpret_cast<void***>(reinterpret_cast<char*>(ptr) + mfi.thisptroffs + mfi.vtbloffs) + mfi.vtblindex);
+		*reinterpret_cast<void***>(reinterpret_cast<char*>(CCW<Y>::GRP(ptr)) + mfi.thisptroffs + mfi.vtbloffs) + mfi.vtblindex);
 
 #define SH__CALL_GET_VFNPTR_MANUAL \
 	using namespace ::SourceHook; \
diff --git a/core-legacy/sourcehook/sourcehook.h b/core-legacy/sourcehook/sourcehook.h
index fecc7d7..575614b 100644
--- a/core-legacy/sourcehook/sourcehook.h
+++ b/core-legacy/sourcehook/sourcehook.h
@@ -5214,7 +5214,7 @@ namespace SourceHook
 	MemFuncInfo mfi = {true, -1, 0, 0}; \
 	GetFuncInfo(CCW<Y>::GRP(ptr), mfp, mfi); \
 	void *vfnptr = reinterpret_cast<void*>( \
-		*reinterpret_cast<void***>(reinterpret_cast<char*>(ptr) + mfi.thisptroffs + mfi.vtbloffs) + mfi.vtblindex);
+		*reinterpret_cast<void***>(reinterpret_cast<char*>(CCW<Y>::GRP(ptr)) + mfi.thisptroffs + mfi.vtbloffs) + mfi.vtblindex);
 
 #define SH__CALL_GET_VFNPTR_MANUAL \
 	using namespace ::SourceHook; \