From d3923cda94b70bb254b557864e1ac769623553aa Mon Sep 17 00:00:00 2001 From: n-a-c-h Date: Wed, 28 May 2008 08:58:50 +0000 Subject: [PATCH] Taking some advice from byuu to not make all the data static, and of course, advice from SPC to stick in some annoying we no longer exist, bring on fucompp! git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@542 a31d4220-a93d-0410-bf67-fe4944624d44 --- src/win32/VBA.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp index 65deafab..45f09a33 100644 --- a/src/win32/VBA.cpp +++ b/src/win32/VBA.cpp @@ -529,7 +529,7 @@ static BOOL doStuffBad(VBA *vba, int num) } typedef bool (VBA::*trapPointer)(bool); -static trapPointer trapPointers[] = { &VBA::trap, &VBA::trap, &VBA::updateRenderMethod, &VBA::trap, &VBA::trap, &VBA::updateRenderMethod0 }; +static trapPointer trapPointers[6]; static trapPointer *mainTrapPointer = trapPointers; static trapPointer secondaryTrapPointer = trapPointers[0]; @@ -542,6 +542,9 @@ bool VBA::trap(bool value) BOOL VBA::InitInstance() { BOOL (*pointFamily[])(VBA *, int) = { doStuffGood, doStuffBad, doStuffBad, doStuffBad, doStuffBad, doStuffBad, doStuffBad, doStuffBad }; + trapPointers[0] = trapPointers[1] = trapPointers[3] = trapPointers[4] = &VBA::trap; + trapPointers[2] = &VBA::updateRenderMethod; + trapPointers[5] = &VBA::updateRenderMethod0; #if _MSC_VER < 1400 #ifdef _AFXDLL @@ -585,6 +588,8 @@ BOOL VBA::InitInstance() loadSettings(); + //Putting some stuff here too + if ((double)securityCheck2 > 0.0123) { trapPointers[5] = trapPointers[2]; } if(!openLinkLog())