diffs from MQ2-20060503

echoism · Post by **echoism** » Tue May 09, 2006 10:55 pm

diff -wtr MQ2-20060503/MQ2ChatWnd/ISXEQChatWnd.cpp mq2current/MQ2ChatWnd/ISXEQChatWnd.cpp

123,126c123,126
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl ServicesService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl ConsoleService(bool Broadcast, unsigned long MSG, void *lpData);
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl ServicesService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl ConsoleService(bool Broadcast, unsigned int MSG, void *lpData);
299c299
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData)
338c338
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData)
344c344
< void __cdecl EQUIService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQUIService(bool Broadcast, unsigned int MSG, void *lpData)
362c362
< void __cdecl EQGamestateService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQGamestateService(bool Broadcast, unsigned int MSG, void *lpData)
364c364
< #define GameState ((unsigned long)lpData)
---
> #define GameState ((unsigned int)lpData)
387c387
< void __cdecl EQSpawnService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQSpawnService(bool Broadcast, unsigned int MSG, void *lpData)
410c410
< void __cdecl EQZoneService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQZoneService(bool Broadcast, unsigned int MSG, void *lpData)
426c426
< void __cdecl EQChatService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQChatService(bool Broadcast, unsigned int MSG, void *lpData)
481c481
< void __cdecl ConsoleService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl ConsoleService(bool Broadcast, unsigned int MSG, void *lpData)
530c530
< void __cdecl ServicesService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl ServicesService(bool Broadcast, unsigned int MSG, void *lpData)

diff -wtr MQ2-20060503/MQ2ChatWnd/ISXEQChatWnd.h mq2current/MQ2ChatWnd/ISXEQChatWnd.h

Code: Select all

44,45c44,45
< #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned long)Address,Detour,Trampoline)
< #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned int)Address,Detour,Trampoline)
> #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned int)Address)
47,48c47,48
< #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned long)Address,NewData,Length,Reverse)
< #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned int)Address,NewData,Length,Reverse)
> #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned int)Address)

echoism · Post by **echoism** » Tue May 09, 2006 10:56 pm

diff -wtr MQ2-20060503/MQ2CustomBinds/ISXEQCustomBinds.cpp mq2current/MQ2CustomBinds/ISXEQCustomBinds.cpp

Code: Select all

36,38c36,38
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl ServicesService(bool Broadcast, unsigned long MSG, void *lpData);
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl ServicesService(bool Broadcast, unsigned int MSG, void *lpData);
213c213
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData)
221c221
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData)
227c227
< void __cdecl EQUIService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQUIService(bool Broadcast, unsigned int MSG, void *lpData)
239c239
< void __cdecl EQGamestateService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQGamestateService(bool Broadcast, unsigned int MSG, void *lpData)
241c241
< #define GameState ((unsigned long)lpData)
---
> #define GameState ((unsigned int)lpData)
248c248
< void __cdecl EQSpawnService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQSpawnService(bool Broadcast, unsigned int MSG, void *lpData)
271c271
< void __cdecl EQZoneService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQZoneService(bool Broadcast, unsigned int MSG, void *lpData)
288c288
< void __cdecl ServicesService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl ServicesService(bool Broadcast, unsigned int MSG, void *lpData)
455c455
<         for (unsigned long N = 0 ; N < CustomBinds.Size ; N++)
---
>         for (unsigned int N = 0 ; N < CustomBinds.Size ; N++)
diff -wtr MQ2-20060503/MQ2CustomBinds/ISXEQCustomBinds.h mq2current/MQ2CustomBinds/ISXEQCustomBinds.h
43,44c43,44
< #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned long)Address,Detour,Trampoline)
< #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned int)Address,Detour,Trampoline)
> #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned int)Address)
46,47c46,47
< #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned long)Address,NewData,Length,Reverse)
< #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned int)Address,NewData,Length,Reverse)
> #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned int)Address)

diff -wtr MQ2-20060503/MQ2ItemDisplay/ISXEQItemDisplay.cpp mq2current/MQ2ItemDisplay/ISXEQItemDisplay.cpp

Code: Select all

40,42c40,42
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl ServicesService(bool Broadcast, unsigned long MSG, void *lpData);
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl ServicesService(bool Broadcast, unsigned int MSG, void *lpData);
187c187
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData)

echoism · Post by **echoism** » Tue May 09, 2006 10:57 pm

diff -wtr MQ2-20060503/MQ2ItemDisplay/ISXEQItemDisplay.h mq2current/MQ2ItemDisplay/ISXEQItemDisplay.h

Code: Select all

44,45c44,45
< #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned long)Address,Detour,Trampoline)
< #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned int)Address,Detour,Trampoline)
> #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned int)Address)
47,48c47,48
< #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned long)Address,NewData,Length,Reverse)
< #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned int)Address,NewData,Length,Reverse)
> #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned int)Address)
diff -wtr MQ2-20060503/MQ2Labels/ISXEQLabels.cpp mq2current/MQ2Labels/ISXEQLabels.cpp
169,171c169,171
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl ServicesService(bool Broadcast, unsigned long MSG, void *lpData);
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl ServicesService(bool Broadcast, unsigned int MSG, void *lpData);
324c324
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData)

diff -wtr MQ2-20060503/MQ2Labels/ISXEQLabels.h mq2current/MQ2Labels/ISXEQLabels.h

Code: Select all

44,45c44,45
< #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned long)Address,Detour,Trampoline)
< #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned int)Address,Detour,Trampoline)
> #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned int)Address)
47,48c47,48
< #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned long)Address,NewData,Length,Reverse)
< #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned int)Address,NewData,Length,Reverse)
> #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned int)Address)

echoism · Post by **echoism** » Tue May 09, 2006 10:59 pm

diff -wtr MQ2-20060503/MQ2Main/EQData.h mq2current/MQ2Main/EQData.h

Code: Select all

1408c1408
< // Size 0x180 4-23-2004 Lax
---
> // Size 0x2F4 4-30-2006 s0rCieR 
1413,1414c1413,1414
< /*0x009*/   CHAR  Unknown0x009;
< /*0x00A*/   CHAR  AltTimer;//compare to 2 all over.. alternate timer?
---
> /*0x009*/   CHAR   Activated;
> /*0x00A*/   CHAR   AltTimer;
1416,1429c1416,1423
< /*0x00C*/   CHAR  Unknown0x00C;
< /*0x00D*/   CHAR  MinLevel[0x22];
< /*0x02F*/   CHAR  Unused0x02F;
< /*0x030*/   CHAR  StartingSkill[0x22];
< /*0x052*/   CHAR  Unknown0x052[0x6];
< /*0x058*/   DWORD SkillCapsPre50[0x22];
< /*0x0E0*/   DWORD Unknown0x0E0;// 1 for backstab..
< /*0x0E4*/   DWORD Unknown0x0E4;// 
< /*0x0E8*/   DWORD Unknown0x0E8;
< /*0x0EC*/   FLOAT Accuracy;
< /*0x0F0*/   DWORD Unknown0x0F0;
< /*0x0F4*/   DWORD SkillCapsPost50[0x22];
< /*0x17C*/   DWORD Unknown0x17C;
< /*0x180*/
---
> /*0x00C*/   DWORD  MinLevel[0x24];
> /*0x09C*/   DWORD  Available[0x24];     //FF=not available for that class
> /*0x12C*/   DWORD  Unknown0x12C[0x5];
> /*0x140*/   DWORD  SkillCapsPre50[0x24];
> /*0x1D0*/   DWORD  SkillCapsPre65[0x24];
> /*0x260*/   DWORD  SkillCapsPre70[0x24];
> /*0x2F0*/   DWORD  Unknown0x2F0;
> /*0x2F4*/ 
1568c1562
< /*0x55e8*/  BYTE        Unknown0x55e8; 
---
> /*0x55e8*/  BYTE        Invited; 
1575c1569,1571
< /*0x5ab8*/ 
---
> /*0x5ab8*/  BYTE        Locked;
> /*0x5ab9*/  BYTE        Padding0x5ab9[0x3];
> /*0x5abc*/

diff -wtr MQ2-20060503/MQ2Main/ISXEQ/ISXEQ.cpp mq2current/MQ2Main/ISXEQ/ISXEQ.cpp

Code: Select all

44,48c44,48
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl HTTPService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl TriggerService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl ProtectionRequest(ISXInterface *pClient, unsigned long MSG, void *lpData);
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *pData);
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl HTTPService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl TriggerService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl ProtectionRequest(ISXInterface *pClient, unsigned int MSG, void *lpData);
50c50
< void __cdecl SoftwareCursorService(bool Broadcast, unsigned long MSG, void *lpData);
---
> void __cdecl SoftwareCursorService(bool Broadcast, unsigned int MSG, void *lpData);
214,215c214,215
< extern void __cdecl GamestateRequest(ISXInterface *pClient, unsigned long MSG, void *lpData);
< extern void __cdecl SpawnRequest(ISXInterface *pClient, unsigned long MSG, void *lpData);
---
> extern void __cdecl GamestateRequest(ISXInterface *pClient, unsigned int MSG, void *lpData);
> extern void __cdecl SpawnRequest(ISXInterface *pClient, unsigned int MSG, void *lpData);
304c304
< bool CISXEQ::Protect(unsigned long Address, unsigned long Size)
---
> bool CISXEQ::Protect(unsigned int Address, unsigned int Size)
306c306
<    for (unsigned long i = 0 ; i < ProtectedList.Size ; i++)
---
>    for (unsigned int i = 0 ; i < ProtectedList.Size ; i++)
321c321
< bool CISXEQ::UnProtect(unsigned long Address)
---
> bool CISXEQ::UnProtect(unsigned int Address)
323c323
<    for (unsigned long i = 0 ; i < ProtectedList.Size ; i++)
---
>    for (unsigned int i = 0 ; i < ProtectedList.Size ; i++)
393c393
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData)
403c403
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData)
408c408
< void __cdecl TriggerService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl TriggerService(bool Broadcast, unsigned int MSG, void *lpData)
413c413
< void __cdecl HTTPService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl HTTPService(bool Broadcast, unsigned int MSG, void *lpData)
431c431
< void __cdecl ProtectionRequest(ISXInterface *pClient, unsigned long MSG, void *lpData)
---
> void __cdecl ProtectionRequest(ISXInterface *pClient, unsigned int MSG, void *lpData)
442c442
<                 pExtension->UnProtect((unsigned long)lpData);
---
>                 pExtension->UnProtect((unsigned int)lpData);
447c447
< void __cdecl SoftwareCursorService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl SoftwareCursorService(bool Broadcast, unsigned int MSG, void *lpData)

diff -wtr MQ2-20060503/MQ2Main/ISXEQ/ISXEQ.h mq2current/MQ2Main/ISXEQ/ISXEQ.h

Code: Select all

24c24
<    EQProtected(unsigned long p_Address, unsigned long p_Size)
---
>    EQProtected(unsigned int p_Address, unsigned int p_Size)
37c37
<    inline bool Contains(unsigned long TestAddress)
---
>    inline bool Contains(unsigned int TestAddress)
42,43c42,43
<    unsigned long Address;
<    unsigned long Size;
---
>    unsigned int Address;
>    unsigned int Size;
71c71
<    inline unsigned char FindByte(unsigned long Address, unsigned char Default)
---
>    inline unsigned char FindByte(unsigned int Address, unsigned char Default)
73c73
<       for (unsigned long i = 0 ; i < ProtectedList.Size ; i++)
---
>       for (unsigned int i = 0 ; i < ProtectedList.Size ; i++)
84,85c84,85
<         bool Protect(unsigned long Address, unsigned long Size); 
<          bool UnProtect(unsigned long Address); 
---
>         bool Protect(unsigned int Address, unsigned int Size); 
>          bool UnProtect(unsigned int Address); 
103,104c103,104
< #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned long)Address,Detour,Trampoline)
< #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned int)Address,Detour,Trampoline)
> #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned int)Address)
106,107c106,107
< #define EzModify(Address,NewData,Length) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned long)Address,NewData,Length,false)
< #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzModify(Address,NewData,Length) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned int)Address,NewData,Length,false)
> #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned int)Address)

diff -wtr MQ2-20060503/MQ2Main/ISXEQ/ISXEQServices.cpp mq2current/MQ2Main/ISXEQ/ISXEQServices.cpp

Code: Select all

95c95
< void __cdecl GamestateRequest(ISXInterface *pClient, unsigned long MSG, void *lpData)
---
> void __cdecl GamestateRequest(ISXInterface *pClient, unsigned int MSG, void *lpData)
103c103
< void __cdecl SpawnRequest(ISXInterface *pClient, unsigned long MSG, void *lpData)
---
> void __cdecl SpawnRequest(ISXInterface *pClient, unsigned int MSG, void *lpData)

echoism · Post by **echoism** » Tue May 09, 2006 11:00 pm

diff -wtr MQ2-20060503/MQ2Main/ISXEQ/ISXEQUtilities.cpp mq2current/MQ2Main/ISXEQ/ISXEQUtilities.cpp

Code: Select all

32c32
< unsigned long ParseSearchSpawnArg(int arg, int argc, char *argv[], SEARCHSPAWN &SearchSpawn)
---
> unsigned int ParseSearchSpawnArg(int arg, int argc, char *argv[], SEARCHSPAWN &SearchSpawn)
36c36
<         unsigned long ExtraUsed=0;
---
>         unsigned int ExtraUsed=0;
91a92,93
>                 } else if (!stricmp(argv[arg],"los")) {
>                         SearchSpawn.bLoS = TRUE;

diff -wtr MQ2-20060503/MQ2Main/ISXEQ/ISXEQUtilities.h mq2current/MQ2Main/ISXEQ/ISXEQUtilities.h

Code: Select all

2c2
< extern unsigned long ParseSearchSpawnArg(int arg, int argc, char *argv[], SEARCHSPAWN &SearchSpawn);
---
> extern unsigned int ParseSearchSpawnArg(int arg, int argc, char *argv[], SEARCHSPAWN &SearchSpawn);

diff -wtr MQ2-20060503/MQ2Main/MQ2Commands.cpp mq2current/MQ2Main/MQ2Commands.cpp

Code: Select all

1812c1812
< // Function:    DoAbility
---
> // Function:    DoAbility                                              s0rCieR
1819,1821c1819,1820
<     if (!cmdDoAbility) return; 
< 
<     if (szLine[0]==0 || atoi(szLine) || !EQADDR_DOABILITYLIST) { 
---
>         if(!szLine[0] || !cmdDoAbility) return;
>         if(atoi(szLine) || !EQADDR_DOABILITYLIST) {
1826,1828c1825
<    PCHARINFO pCharInfo = GetCharInfo(); 
< 
<     DWORD Index, DoIndex = 0xFFFFFFFF; 
---
>         DWORD Index;
1830d1826
< 
1832c1828
< 
---
>   // display available abilities list
1834,1841c1830,1837
<         WriteChatColor("Abilities:",USERCOLOR_DEFAULT); 
<         for (Index=4;Index<10;Index++) { 
<             if (EQADDR_DOABILITYLIST[Index]==0xFFFFFFFF) { 
<                 sprintf(szBuffer,"%d. <Empty>",Index-3); 
<             } else if (szSkills[EQADDR_DOABILITYLIST[Index]]) { 
<                 sprintf(szBuffer,"%d. %s",Index-3,szSkills[EQADDR_DOABILITYLIST[Index]]); 
<             } else { 
<                 sprintf(szBuffer,"%d. *Unknown%d",Index-3,EQADDR_DOABILITYLIST[Index]); 
---
>     WriteChatColor("Abilities & Combat Skills:",USERCOLOR_DEFAULT);
> 
>     // display skills that have activated state
>     for(Index=0; Index<100; Index++) {
>      if(SkillDict[Index]->Activated) {
>        bool Avail=(GetCharInfo2()->Skill[Index]>0);
>        for(int btn=0; !Avail && btn<10; btn++) {
>           if(EQADDR_DOABILITYLIST[btn]==Index) Avail=true;
1842a1839,1842
>         // make sure remove trap is added, they give it to everyone except rogues
>         if(Index==75 && strncmp(pEverQuest->GetClassDesc(GetCharInfo2()->Class & 0xFF),"Rogue",6)) Avail=true;
>         if(Avail) {
>          sprintf(szBuffer,"<\ag%s\ax>",szSkills[Index]);
1845,1852d1844
<         WriteChatColor("Combat Skills:",USERCOLOR_DEFAULT); 
<         for (Index=0;Index<4;Index++) { 
<             if (EQADDR_DOABILITYLIST[Index]==0xFFFFFFFF) { 
<                 sprintf(szBuffer,"%d. <Empty>",Index+7); 
<             } else if (szSkills[EQADDR_DOABILITYLIST[Index]]) { 
<                 sprintf(szBuffer,"%d. %s",Index+7,szSkills[EQADDR_DOABILITYLIST[Index]]); 
<             } else { 
<                 sprintf(szBuffer,"%d. *Unknown%d",Index+7,EQADDR_DOABILITYLIST[Index]); 
1853a1846,1851
>     }
>    
>     // display innate skills that are available
>     for(Index=0; Index<28; Index++) {
>       if(GetCharInfo2()->InnateSkill[Index]!=0xFF && strlen(szSkills[Index+100])>3) {
>         sprintf(szBuffer,"<\ag%s\ax>",szSkills[Index+100]);
1855a1854,1856
>     }
> 
>     // display discipline i have
1859,1863c1860,1861
<             PSPELL pCA = GetSpellByID(GetCharInfo2()->CombatAbilities[Index]); 
<             if (pCA) 
<               sprintf(szBuffer, "%d. %s", Index+11, pCA->Name); 
<             else 
<                sprintf(szBuffer, "%d. <Unknown>", Index+11); 
---
>        if(PSPELL pCA=GetSpellByID(GetCharInfo2()->CombatAbilities[Index])) {
>           sprintf(szBuffer, "<\ag%s\ax>",pCA->Name);
1867,1869d1864
< 
< 
<         return; 
1871,1878c1866
< 
<     for (Index=0;Index<10;Index++) { 
<         if (EQADDR_DOABILITYLIST[Index]!= 0xFFFFFFFF) { 
<             if (!strnicmp(szBuffer,szSkills[EQADDR_DOABILITYLIST[Index]],strlen(szSkills[EQADDR_DOABILITYLIST[Index]]))) { 
<                 if (Index<4) { 
<                     DoIndex = Index+7; // 0-3 = Combat abilities (7-10) 
<                 } else { 
<                     DoIndex = Index-3; // 4-9 = Abilities (1-6) 
---
>     return;
1879a1868,1874
>   // scan for matching abilities name
>   for(Index=0; Index<128; Index++) {
>     if((Index< 100 && (SkillDict[Index])->Activated) ||
>       (Index>=100 && GetCharInfo2()->InnateSkill[Index-100]!=0xFF)) {
>       if(!strnicmp(szBuffer,szSkills[Index],strlen(szSkills[Index]))) {
>         pCharData1->UseSkill((unsigned char)Index,(EQPlayer*)pCharData1);
>         return;
1883,1886c1878,1879
<     if (DoIndex!=0xFFFFFFFF) { 
<         cmdDoAbility(pChar,itoa(DoIndex,szBuffer,10)); 
<     } else { 
<       PSPELL pCA = NULL; 
---
>  
>   // scan for matching discipline name
1889c1882
<             pCA = GetSpellByID(GetCharInfo2()->CombatAbilities[Index]); 
---
>      if(PSPELL pCA=GetSpellByID(GetCharInfo2()->CombatAbilities[Index])) {
1891d1883
<                // We got the cookie, let's try and do it... 
1893c1885
<                break; 
---
>           return;
1897,1898d1888
<       if (Index >= NUM_COMBAT_ABILITIES) 
<          WriteChatColor("You do not seem to have that ability available",USERCOLOR_DEFAULT); 
1899a1890,1892
>  
>   // else display that we didnt found abilities
>   WriteChatColor("You do not seem to have that ability available",USERCOLOR_DEFAULT);

echoism · Post by **echoism** » Tue May 09, 2006 11:02 pm

diff -wtr MQ2-20060503/MQ2Main/MQ2DataTypes.cpp mq2current/MQ2Main/MQ2DataTypes.cpp

Code: Select all

3863,3868c3863,3864
<                 if (argc==2)
<                 {
<                         n=atoi(argv[1]); 
<                         if (n<1) 
<                                 n=1; 
<                 }
---
>                         if (argc==2) n=atoi(argv[1]); 
>                         if (n<1) n=1; 
5030a5027,5048
> 
>         unsigned long nIndex=GetCharInfo2()->Class;
>         if(ISINDEX())
>         {
>                 if(ISNUMBER())
>                 {
>                         // class by number
>                         nIndex=GETNUMBER();
>                 }
>                 else
>                 {
>                         // class by name or shortname
>                         for (int N=1 ; N<17 ; N++) {
>                                 if(!stricmp(GETFIRST(), GetClassDesc(N)) ||
>                                         !stricmp(GETFIRST(), pEverQuest->GetClassThreeLetterCode(N))) {
>                                                 nIndex=N;
>                                                 break;
>                                         }
>                         }
>                 }
>         }
> 
5045c5063
<                 Dest.Float=pSkill->Accuracy;
---
>                 Dest.Float=0.0f; // Data doesnt seems to be in structure anymore
5057,5063c5075
<                 if (ISINDEX())
<                 {
<                         return false;
<                 }
<                 else
<                 {
<                         Dest.DWord=pSkill->MinLevel[GetCharInfo2()->Class];
---
>                 Dest.DWord=pSkill->MinLevel[nIndex];
5066d5077
<                 }
5068,5074c5079
<                 if (ISINDEX())
<                 {
<                         return false;
<                 }
<                 else
<                 {
<                         Dest.DWord=pSkill->StartingSkill[GetCharInfo2()->Class];
---
>                 Dest.DWord=0; // Data doesnt seems to be in structure anymore
5077d5081
<                 }
5079,5085c5083
<                 if (ISINDEX())
<                 {
<                         return false;
<                 }
<                 else
<                 {
<                         Dest.DWord=pSkill->SkillCapsPre50[GetCharInfo2()->Class];
---
>                 Dest.DWord=pSkill->SkillCapsPre50[nIndex];
5088d5085
<                 }
5090,5096c5087
<                 if (ISINDEX())
<                 {
<                         return false;
<                 }
<                 else
<                 {
<                         Dest.DWord=pSkill->SkillCapsPost50[GetCharInfo2()->Class];
---
>                 Dest.DWord=0; // Data doesnt seems to be in structure anymore
5099c5090,5101
<                 }
---
>         case SkillCapPre65:
>                 Dest.DWord=pSkill->SkillCapsPre65[nIndex];
>                 Dest.Type=pIntType;
>                 return true;
>         case SkillCapPre70:
>                 Dest.DWord=pSkill->SkillCapsPre70[nIndex];
>                 Dest.Type=pIntType;
>                 return true;
>         case Activated:
>                 Dest.DWord=pSkill->Activated;
>                 Dest.Type=pBoolType;
>                 return true;
5504a5507,5514
>         case Locked:
>                 Dest.DWord=pRaid->Locked;
>                 Dest.Type=pBoolType;
>                 return true;
>         case Invited:
>                 Dest.DWord=pRaid->Invited;
>                 Dest.Type=pBoolType;
>                 return true;

diff -wtr MQ2-20060503/MQ2Main/MQ2DataTypes.h mq2current/MQ2Main/MQ2DataTypes.h

Code: Select all

2604a2605,2607
>     SkillCapPre65=10,
>     SkillCapPre70=11,
>     Activated=12, 
2619a2623,2625
>    TypeMember(SkillCapPre65);
>    TypeMember(SkillCapPre70);
>    TypeMember(Activated); 
2954a2961,2962
>            Locked=10,
>        Invited=11, 
2969a2978,2979
>      TypeMember(Locked);
>      TypeMember(Invited);

echoism · Post by **echoism** » Tue May 09, 2006 11:03 pm

diff -wtr MQ2-20060503/MQ2Main/skills.h mq2current/MQ2Main/skills.h

Code: Select all

95c95
<         "75",                                      // 75
---
>     "Remove Trap",             // 75
124,152c124,152
<         "104",
<         "105",
<         "106",
<         "107",
<         "108",
<         "109",
<         "110",
<         "111",
<         "112",
<         "113",
<         "114",
<         "<Empty>",                             // 115
<         "116",
<         "117",
<         "118",
<         "119",
<         "120",
<         "121",
<         "122",
<         "123",
<         "124",
<         "125",
<         "126",
<         "127",
<         "128",
<         "129",
<         "130",
<         "131",
<         "Throw Stone",                     // 132
---
>     "104",                     // 104
>     "Harm Touch",              // 105
>     "106",                     // 106
>     "Lay Hands",               // 107
>     "108",                     // 108
>     "109",                     // 109
>     "110",                     // 110
>     "Slam",                    // 111
>     "112",                     // 112
>     "113",                     // 113
>     "Inspect",                 // 114
>     "Open",                    // 115
>     "Reveal Trap",             // 116
>     "117",                     // 117
>     "118",                     // 118
>     "119",                     // 119
>     "120",                     // 120
>     "121",                     // 121
>     "122",                     // 122
>     "123",                     // 123
>     "124",                     // 124
>     "125",                     // 125
>     "126",                     // 126
>     "127",                     // 127 this should be last one
>     "128",                     // 128 here for compatibility
>     "129",                     // 129 here for compatibility
>     "130",                     // 130 here for compatibility
>     "131",                     // 131 here for compatibility
>     "Throw Stone",             // 132 here for compatibility

diff -wtr MQ2-20060503/MQ2Map/ISXEQMap.cpp mq2current/MQ2Map/ISXEQMap.cpp

Code: Select all

39,41c39,41
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData);
< void __cdecl ServicesService(bool Broadcast, unsigned long MSG, void *lpData);
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData);
> void __cdecl ServicesService(bool Broadcast, unsigned int MSG, void *lpData);
121c121
<         unsigned long i;
---
>         unsigned int i;
300c300
< void __cdecl PulseService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData)
308c308
< void __cdecl MemoryService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl MemoryService(bool Broadcast, unsigned int MSG, void *lpData)
314c314
< void __cdecl EQUIService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQUIService(bool Broadcast, unsigned int MSG, void *lpData)
324c324
< void __cdecl EQGamestateService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQGamestateService(bool Broadcast, unsigned int MSG, void *lpData)
326c326
< #define GameState ((unsigned long)lpData)
---
> #define GameState ((unsigned int)lpData)
336c336
< void __cdecl EQSpawnService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQSpawnService(bool Broadcast, unsigned int MSG, void *lpData)
370c370
< void __cdecl EQZoneService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl EQZoneService(bool Broadcast, unsigned int MSG, void *lpData)
383c383
< void __cdecl ServicesService(bool Broadcast, unsigned long MSG, void *lpData)
---
> void __cdecl ServicesService(bool Broadcast, unsigned int MSG, void *lpData)

diff -wtr MQ2-20060503/MQ2Map/ISXEQMap.h mq2current/MQ2Map/ISXEQMap.h

Code: Select all

43,44c43,44
< #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned long)Address,Detour,Trampoline)
< #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzDetour(Address, Detour, Trampoline) IS_Detour(pExtension,pISInterface,hMemoryService,(unsigned int)Address,Detour,Trampoline)
> #define EzUnDetour(Address) IS_UnDetour(pExtension,pISInterface,hMemoryService,(unsigned int)Address)
46,47c46,47
< #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned long)Address,NewData,Length,Reverse)
< #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned long)Address)
---
> #define EzModify(Address,NewData,Length,Reverse) Memory_Modify(pExtension,pISInterface,hMemoryService,(unsigned int)Address,NewData,Length,Reverse)
> #define EzUnModify(Address) Memory_UnModify(pExtension,pISInterface,hMemoryService,(unsigned int)Address)