[Decaldev-cvscommit] source/Inject Manager.h,1.25,1.26 Manager.cpp,1.59,1.60

[<ha...@us...>]

Update of /cvsroot/decaldev/source/Inject
In directory usw-pr-cvs1:/tmp/cvs-serv12768

Modified Files:
	Manager.h Manager.cpp 
Log Message:
Moved ACHooks startup to pre-Decal Service startup so services, filters and the like can obtain a reference much easier from the decal object itself.  Also, general cleanup.

Index: Manager.h
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/Manager.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Manager.h	1 Aug 2002 00:52:24 -0000	1.25
--- Manager.h	22 Sep 2002 08:15:08 -0000	1.26
***************
*** 68,75 ****
     };
  
- 	DWORD m_dwPrevItems[2];
- 	DWORD m_dwCurrentItems[2];
- 	DWORD m_dwMouseMoves[8];
- 
     long m_nNextPlugin;
     typedef std::list< cPlugin > cPluginList;
--- 68,71 ----
***************
*** 124,130 ****
     DWORD m_dwChatMessageAddy;
   
-    long m_lCombatState;
-    long m_lChatState;
-    
     long m_lPrevSelKey;
  
--- 120,123 ----

Index: Manager.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/Manager.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** Manager.cpp	24 Aug 2002 02:29:44 -0000	1.59
--- Manager.cpp	22 Sep 2002 08:15:08 -0000	1.60
***************
*** 133,141 ****
  void (*pfnOldChatMessage)(char*, DWORD) = NULL;
  void (*pfnOldChatText)(void) = NULL;
- void (*pfnCastSpell)(DWORD) = NULL;
- void (*pfnMoveItem)(DWORD, DWORD, DWORD, DWORD) = NULL;
- void (*pfnUseItem)(DWORD, DWORD) = NULL;
- void (*pfnSelectItem)(DWORD) = NULL;
- void (*pfnGetFellowStats)(DWORD) = NULL;
  
  void OnChatMessage (char* pText, long dwColor);
--- 133,136 ----
***************
*** 233,237 ****
     }
  
!    m_pHooks.CoCreateInstance( _bstr_t( "Decal.ACHooks" ), NULL, CLSCTX_INPROC_SERVER );
  
     // Load the Memlocs XML
--- 228,232 ----
     }
  
!    m_pDecal->get_Hooks( &m_pHooks );
  
     // Load the Memlocs XML
***************
*** 332,385 ****
  		   pfnOldChatText = reinterpret_cast< void (*)() > (Val/*0x00412D00*/);
  
- 	   if(QueryMemLoc(_bstr_t("CastSpell"), &Val)==S_OK)
- 		   pfnCastSpell = reinterpret_cast< void (*)(DWORD) > (Val);
- 
- 	   if(QueryMemLoc(_bstr_t("MoveItem"), &Val)==S_OK)
- 		   pfnMoveItem = reinterpret_cast< void (*)(DWORD, DWORD, DWORD, DWORD) > (Val);
- 	   
- 	   if(QueryMemLoc(_bstr_t("UseItem"), &Val)==S_OK)
- 		   pfnUseItem = reinterpret_cast< void (*)(DWORD, DWORD) > (Val);
- 
- 	   if(QueryMemLoc(_bstr_t("SelectItem"), &Val)==S_OK)
- 		   pfnSelectItem = reinterpret_cast< void (*)(DWORD) > (Val);
- 
  	   if(QueryMemLoc(_bstr_t("ChatMessageAddy"), &Val)==S_OK)
  		   m_dwChatMessageAddy = (DWORD)Val;
- 
-  	   if(QueryMemLoc(_bstr_t("CombatState"), &Val)==S_OK)
-  		  m_lCombatState = Val;
- 
-  	   if(QueryMemLoc(_bstr_t("ChatState"), &Val)==S_OK)
-  		  m_lChatState = Val;
- 
-  	   if(QueryMemLoc(_bstr_t("GetFellowStats"), &Val)==S_OK)
-  		  pfnGetFellowStats = reinterpret_cast< void (*)(DWORD) > (Val);
- 
- 	   if(QueryMemLoc(_bstr_t("Mouse1X"), &Val)==S_OK)
- 		   m_dwMouseMoves[0] = (DWORD)Val;
- 	   if(QueryMemLoc(_bstr_t("Mouse1Y"), &Val)==S_OK)
- 		   m_dwMouseMoves[1] = (DWORD)Val;
- 	   if(QueryMemLoc(_bstr_t("Mouse2X"), &Val)==S_OK)
- 		   m_dwMouseMoves[2] = (DWORD)Val;
- 	   if(QueryMemLoc(_bstr_t("Mouse2Y"), &Val)==S_OK)
- 		   m_dwMouseMoves[3] = (DWORD)Val;
- 	   if(QueryMemLoc(_bstr_t("Mouse3X"), &Val)==S_OK)
- 		   m_dwMouseMoves[4] = (DWORD)Val;	
- 	   if(QueryMemLoc(_bstr_t("Mouse3Y"), &Val)==S_OK)
- 		   m_dwMouseMoves[5] = (DWORD)Val;
- 	   if(QueryMemLoc(_bstr_t("Mouse4X"), &Val)==S_OK)
- 		   m_dwMouseMoves[6] = (DWORD)Val;
- 	   if(QueryMemLoc(_bstr_t("Mouse4Y"), &Val)==S_OK)
- 		   m_dwMouseMoves[7] = (DWORD)Val;
- 
- 	   if(QueryMemLoc(_bstr_t("PrevItem1"), &Val)==S_OK)
- 		   m_dwPrevItems[0] = (DWORD)Val;
- 	   if(QueryMemLoc(_bstr_t("PrevItem2"), &Val)==S_OK)
- 		   m_dwPrevItems[1] = (DWORD)Val;
- 
- 	   if(QueryMemLoc(_bstr_t("CurrentItem1"), &Val)==S_OK)
- 		   m_dwCurrentItems[0] = (DWORD)Val;
- 	   if(QueryMemLoc(_bstr_t("CurrentItem2"), &Val)==S_OK)
- 		   m_dwCurrentItems[1] = (DWORD)Val;
  
  	   DWORD dwOldProtect;
--- 327,332 ----