Moderator: MacroQuest Developers
1>.\ISXEQ\ISXEQCommands.cpp(555) : error C2039: 'InventoryArray' : is not a member of 'EQData::_CHARINFO2'
1> c:\development\mq2\mq2main\EQData.h(955) : see declaration of 'EQData::_CHARINFO2'
1>.\ISXEQ\ISXEQCommands.cpp(557) : error C2039: 'InventoryArray' : is not a member of 'EQData::_CHARINFO2'
1> c:\development\mq2\mq2main\EQData.h(955) : see declaration of 'EQData::_CHARINFO2'
1>.\ISXEQ\ISXEQCommands.cpp(557) : error C2227: left of '->Item' must point to class/struct/union/generic type
1>.\ISXEQ\ISXEQCommands.cpp(557) : error C2227: left of '->Name' must point to class/struct/union/generic type
1>.\ISXEQ\ISXEQCommands.cpp(559) : error C2039: 'InventoryArray' : is not a member of 'EQData::_CHARINFO2'
1> c:\development\mq2\mq2main\EQData.h(955) : see declaration of 'EQData::_CHARINFO2'
1>.\ISXEQ\ISXEQCommands.cpp(559) : error C2227: left of '->Item' must point to class/struct/union/generic type
1>.\ISXEQ\ISXEQCommands.cpp(559) : error C2227: left of '->Name' must point to class/struct/union/generic type
1>.\ISXEQ\ISXEQCommands.cpp(559) : error C2039: 'InventoryArray' : is not a member of 'EQData::_CHARINFO2'
1> c:\development\mq2\mq2main\EQData.h(955) : see declaration of 'EQData::_CHARINFO2'
1>.\ISXEQ\ISXEQCommands.cpp(560) : error C2039: 'InventoryArray' : is not a member of 'EQData::_CHARINFO2'
1> c:\development\mq2\mq2main\EQData.h(955) : see declaration of 'EQData::_CHARINFO2'
1>.\ISXEQ\ISXEQCommands.cpp(561) : error C2039: 'InventoryArray' : is not a member of 'EQData::_CHARINFO2'
1> c:\development\mq2\mq2main\EQData.h(955) : see declaration of 'EQData::_CHARINFO2'
1>.\ISXEQ\ISXEQCommands.cpp(561) : error C2227: left of '->Item' must point to class/struct/union/generic type
Code: Select all
--- .\ISXEQMapCommands.cpp 2010-10-23 16:38:43.364977000 +1100
+++ C:\Development\MQ2\MQ2Map\ISXEQMapCommands.cpp 2010-10-26 09:40:50.189173200 +1100
@@ -269,7 +269,7 @@
if (argc==3 && !stricmp(argv[2],"reset"))
strcpy(MapTargetNameString,"%N");
else
- pISInterface->GetArgs(2,argc,argv,MapTargetNameString);
+ pISInterface->GetArgs(2,argc,argv,MapTargetNameString, MAX_STRING);
WriteChatf("Target naming string: %s",MapTargetNameString);
pISInterface->SetSetting("ISXEQMap.XML","Naming Schemes","Target",MapTargetNameString);
pISInterface->SaveSettings("ISXEQMap.XML");
@@ -281,7 +281,7 @@
if (argc==3 && !stricmp(argv[2],"reset"))
strcpy(MapNameString,"%N");
else
- pISInterface->GetArgs(2,argc,argv,MapNameString);
+ pISInterface->GetArgs(2,argc,argv,MapNameString, MAX_STRING);
WriteChatf("Normal naming string: %s",MapNameString);
pISInterface->SetSetting("ISXEQMap.XML","Naming Schemes","Normal",MapNameString);
pISInterface->SaveSettings("ISXEQMap.XML");
@@ -344,7 +344,7 @@
return 0;
}
- pISInterface->GetArgs(2,argc,argv,MapSpecialClickString[Combo]);
+ pISInterface->GetArgs(2,argc,argv,MapSpecialClickString[Combo],MAX_STRING);
pISInterface->SetSetting("ISXEQMap.XML","Right Click",szBuffer,MapSpecialClickString[Combo]);
pISInterface->SaveSettings("ISXEQMap.XML");
WriteChatf("%s: %s",DescribeCombo(Combo),MapSpecialClickString[Combo]);Code: Select all
--- .\ISXEQCommandAPI.cpp 2010-10-23 16:38:43.138964000 +1100
+++ C:\Development\MQ2\MQ2Main\ISXEQ\ISXEQCommandAPI.cpp 2010-10-26 09:40:50.489190300 +1100
@@ -174,7 +174,7 @@
return 0;
}
char Line[8192]={0};
- pISInterface->GetArgs(1,argc,argv,Line);
+ pISInterface->GetArgs(1,argc,argv,Line, 8192);
((CCommandHook*)pEverQuest)->Trampoline((PSPAWNINFO)pLocalPlayer,Line);
return 0;
}Code: Select all
--- .\ISXEQCommands.cpp 2010-10-23 16:38:43.161965300 +1100
+++ C:\Development\MQ2\MQ2Main\ISXEQ\ISXEQCommands.cpp 2010-10-26 09:38:27.163992600 +1100
@@ -148,7 +148,7 @@
if (!stricmp(argv[i],"all"))
{
CHAR szRest[MAX_STRING] = {0};
- pISInterface->GetArgs(1,argc,argv,szRest);
+ pISInterface->GetArgs(1,argc,argv,szRest, MAX_STRING);
cmdWho((PSPAWNINFO)pLocalPlayer, szRest);
return 0;
}
@@ -275,7 +275,7 @@
}
CHAR szRest[MAX_STRING] = {0};
- pISInterface->GetArgs(1,argc,argv,szRest);
+ pISInterface->GetArgs(1,argc,argv,szRest, MAX_STRING);
DisplayOverlayText(szRest, CONCOLOR_LIGHTBLUE, 100, 500,500,3000);
return 0;
}
@@ -808,7 +816,7 @@
WriteChatf("Usage: %s <command>", argv[0]);
return 0;
}
- pISInterface->GetArgs(1,argc,argv,chCommand);
+ pISInterface->GetArgs(1,argc,argv,chCommand, 2048);
*(DWORD*)&KeyboardFlags=*(DWORD*)&((PCXWNDMGR)pWndMgr)->KeyboardFlags;
if (!stricmp(argv[0],"nomodkey"))
*(DWORD*)&((PCXWNDMGR)pWndMgr)->KeyboardFlags=0;
@@ -1116,7 +1124,7 @@
return 0;
}
char FullText[8192];
- pISInterface->GetArgs(arg,argc,argv,FullText);
+ pISInterface->GetArgs(arg,argc,argv,FullText,8192);
dsp_chat_no_events(FullText,Color,1);
return 0;
}
*bump*, could you or someone else post a updated patch please?iluvseq wrote:Ah, I must have fixed this locally. I'll post the fix tonight so it can be included in future zips.
Code: Select all
diff -rwu ./MQ2ChatWnd/ISXEQChatWnd.cpp ../mq2_source/MQ2ChatWnd/ISXEQChatWnd.cpp
--- ./MQ2ChatWnd/ISXEQChatWnd.cpp 2011-03-23 03:26:58.000000000 -0400
+++ ../mq2_source/MQ2ChatWnd/ISXEQChatWnd.cpp 2011-03-27 10:42:39.993126000 -0400
@@ -87,7 +87,6 @@
{
if (pWnd == (CXWnd*)InputBox) {
if (Message == XWM_HITENTER) {
- CXSize Whatever;
char szBuffer[2048];
GetCXStr((PCXSTR)InputBox->InputText, szBuffer, 2047);
if (szBuffer[0]) {
@@ -142,7 +141,6 @@
PCHAR* Fonts;
};
FONTDATA* Fonts; // font array structure
- CXStr* str; // contents of stml window
DWORD* SelFont; // selected font
// get fonts structure
diff -rwu ./MQ2CustomBinds/ISXEQCustomBinds.cpp ../mq2_source/MQ2CustomBinds/ISXEQCustomBinds.cpp
--- ./MQ2CustomBinds/ISXEQCustomBinds.cpp 2008-12-29 19:59:34.000000000 -0500
+++ ../mq2_source/MQ2CustomBinds/ISXEQCustomBinds.cpp 2010-10-17 12:31:21.038965400 -0400
@@ -359,7 +359,7 @@
}
char FullText[8192]={0};
- pISInterface->GetArgs(1,argc,argv,FullText); // this gets the rest of the arguments, from 1 to argc
+ pISInterface->GetArgs(1,argc,argv,FullText,8192); // this gets the rest of the arguments, from 1 to argc
WriteChatf("You passed the following text to the command:");
WriteChatf("%s",FullText);
diff -rwu ./MQ2Main/ISXEQ/ISXEQCommandAPI.cpp ../mq2_source/MQ2Main/ISXEQ/ISXEQCommandAPI.cpp
--- ./MQ2Main/ISXEQ/ISXEQCommandAPI.cpp 2007-02-05 01:44:44.000000000 -0500
+++ ../mq2_source/MQ2Main/ISXEQ/ISXEQCommandAPI.cpp 2010-10-17 12:28:52.431465600 -0400
@@ -174,7 +174,7 @@
return 0;
}
char Line[8192]={0};
- pISInterface->GetArgs(1,argc,argv,Line);
+ pISInterface->GetArgs(1,argc,argv,Line,8192);
((CCommandHook*)pEverQuest)->Trampoline((PSPAWNINFO)pLocalPlayer,Line);
return 0;
}
diff -rwu ./MQ2Main/ISXEQ/ISXEQCommands.cpp ../mq2_source/MQ2Main/ISXEQ/ISXEQCommands.cpp
--- ./MQ2Main/ISXEQ/ISXEQCommands.cpp 2009-10-03 19:28:36.000000000 -0400
+++ ../mq2_source/MQ2Main/ISXEQ/ISXEQCommands.cpp 2011-02-25 15:01:26.328983700 -0500
@@ -148,7 +148,7 @@
if (!stricmp(argv[i],"all"))
{
CHAR szRest[MAX_STRING] = {0};
- pISInterface->GetArgs(1,argc,argv,szRest);
+ pISInterface->GetArgs(1,argc,argv,szRest,MAX_STRING);
cmdWho((PSPAWNINFO)pLocalPlayer, szRest);
return 0;
}
@@ -275,7 +275,7 @@
}
CHAR szRest[MAX_STRING] = {0};
- pISInterface->GetArgs(1,argc,argv,szRest);
+ pISInterface->GetArgs(1,argc,argv,szRest,MAX_STRING);
DisplayOverlayText(szRest, CONCOLOR_LIGHTBLUE, 100, 500,500,3000);
return 0;
}
@@ -533,7 +533,7 @@
if (GetCharInfo2()->MemorizedSpells[Index]==0xFFFFFFFF) {
WriteChatf("%d. <Empty>",Index+1);
} else {
- WriteChatf("%d. %s",Index+1,GetSpellByID(GetCharInfo2()->MemorizedSpells[Index]));
+ WriteChatf("%d. %s",Index+1,GetSpellByID(GetCharInfo2()->MemorizedSpells[Index])->Name);
}
}
return 0;
@@ -551,11 +551,11 @@
SpawnFooter = (DWORD)pLocalPlayer;
PITEMINFO pItem=0;
for (int i=0;i<NUM_INV_SLOTS;i++) {
- if (GetCharInfo2()->InventoryArray[i])
- if (!_stricmp(argv[2],GetCharInfo2()->InventoryArray[i]->Item->Name)) {
- DebugSpew("cast test slot %d = %s address is %x",i,GetCharInfo2()->InventoryArray[i]->Item->Name,&(GetCharInfo2()->InventoryArray[i]));
- item = (DWORD)&GetCharInfo2()->InventoryArray[i];
- pItem=GetCharInfo2()->InventoryArray[i]->Item;
+ if (GetCharInfo2()->pInventoryArray->InventoryArray[i])
+ if (!_stricmp(argv[2],GetCharInfo2()->pInventoryArray->InventoryArray[i]->Item->Name)) {
+ DebugSpew("cast test slot %d = %s address is %x",i,GetCharInfo2()->pInventoryArray->InventoryArray[i]->Item->Name,&(GetCharInfo2()->pInventoryArray->InventoryArray[i]));
+ item = (DWORD)&GetCharInfo2()->pInventoryArray->InventoryArray[i];
+ pItem=GetCharInfo2()->pInventoryArray->InventoryArray[i]->Item;
slot = (DWORD)i;
FOUND = TRUE;
break;
@@ -808,7 +808,7 @@
WriteChatf("Usage: %s <command>", argv[0]);
return 0;
}
- pISInterface->GetArgs(1,argc,argv,chCommand);
+ pISInterface->GetArgs(1,argc,argv,chCommand,2048);
*(DWORD*)&KeyboardFlags=*(DWORD*)&((PCXWNDMGR)pWndMgr)->KeyboardFlags;
if (!stricmp(argv[0],"nomodkey"))
*(DWORD*)&((PCXWNDMGR)pWndMgr)->KeyboardFlags=0;
@@ -1116,7 +1116,7 @@
return 0;
}
char FullText[8192];
- pISInterface->GetArgs(arg,argc,argv,FullText);
+ pISInterface->GetArgs(arg,argc,argv,FullText,8192);
dsp_chat_no_events(FullText,Color,1);
return 0;
}
diff -rwu ./MQ2Main/ISXEQ/ISXEQDataTypes.cpp ../mq2_source/MQ2Main/ISXEQ/ISXEQDataTypes.cpp
--- ./MQ2Main/ISXEQ/ISXEQDataTypes.cpp 2009-12-26 18:06:04.000000000 -0500
+++ ../mq2_source/MQ2Main/ISXEQ/ISXEQDataTypes.cpp 2010-11-10 19:58:46.317988200 -0500
@@ -103,7 +103,7 @@
case RightClick:
{
PSPAWNINFO pSpawn = (PSPAWNINFO)GetSpawnByID(pPtr->SpawnID);
- pEverQuest->RightClickedOnPlayer((EQPlayer *)pSpawn);
+ pEverQuest->RightClickedOnPlayer((EQPlayer *)pSpawn, 0);
return true;
}
case xAssist:
diff -rwu ./MQ2Main/ISXEQ/ISXEQUtilities.cpp ../mq2_source/MQ2Main/ISXEQ/ISXEQUtilities.cpp
--- ./MQ2Main/ISXEQ/ISXEQUtilities.cpp 2008-02-26 09:29:10.000000000 -0500
+++ ../mq2_source/MQ2Main/ISXEQ/ISXEQUtilities.cpp 2011-01-22 12:11:30.651664000 -0500
@@ -112,8 +112,10 @@
}
ExtraUsed=2;
} else if (!stricmp(argv[arg],"id")) {
- if (arg+1<argc)
+ if (arg+1<argc) {
SearchSpawn.SpawnID = atoi(argv[arg+1]);
+ SearchSpawn.bSpawnID = TRUE;
+ }
ExtraUsed=1;
} else if (!stricmp(argv[arg],"radius")) {
if (arg+1<argc)
diff -rwu ./MQ2Map/ISXEQMapCommands.cpp ../mq2_source/MQ2Map/ISXEQMapCommands.cpp
--- ./MQ2Map/ISXEQMapCommands.cpp 2008-12-29 19:59:36.000000000 -0500
+++ ../mq2_source/MQ2Map/ISXEQMapCommands.cpp 2010-10-17 12:31:21.034965200 -0400
@@ -269,7 +269,7 @@
if (argc==3 && !stricmp(argv[2],"reset"))
strcpy(MapTargetNameString,"%N");
else
- pISInterface->GetArgs(2,argc,argv,MapTargetNameString);
+ pISInterface->GetArgs(2,argc,argv,MapTargetNameString,MAX_STRING);
WriteChatf("Target naming string: %s",MapTargetNameString);
pISInterface->SetSetting("ISXEQMap.XML","Naming Schemes","Target",MapTargetNameString);
pISInterface->SaveSettings("ISXEQMap.XML");
@@ -281,7 +281,7 @@
if (argc==3 && !stricmp(argv[2],"reset"))
strcpy(MapNameString,"%N");
else
- pISInterface->GetArgs(2,argc,argv,MapNameString);
+ pISInterface->GetArgs(2,argc,argv,MapNameString,MAX_STRING);
WriteChatf("Normal naming string: %s",MapNameString);
pISInterface->SetSetting("ISXEQMap.XML","Naming Schemes","Normal",MapNameString);
pISInterface->SaveSettings("ISXEQMap.XML");
@@ -344,7 +344,7 @@
return 0;
}
- pISInterface->GetArgs(2,argc,argv,MapSpecialClickString[Combo]);
+ pISInterface->GetArgs(2,argc,argv,MapSpecialClickString[Combo],2048);
pISInterface->SetSetting("ISXEQMap.XML","Right Click",szBuffer,MapSpecialClickString[Combo]);
pISInterface->SaveSettings("ISXEQMap.XML");
WriteChatf("%s: %s",DescribeCombo(Combo),MapSpecialClickString[Combo]);
diff -rwu ./MQ2Template/ISXEQTemplate.cpp ../mq2_source/MQ2Template/ISXEQTemplate.cpp
--- ./MQ2Template/ISXEQTemplate.cpp 2008-12-29 19:59:36.000000000 -0500
+++ ../mq2_source/MQ2Template/ISXEQTemplate.cpp 2010-10-17 12:31:21.043965700 -0400
@@ -424,7 +424,7 @@
}
char FullText[8192]={0};
- pISInterface->GetArgs(1,argc,argv,FullText); // this gets the rest of the arguments, from 1 to argc
+ pISInterface->GetArgs(1,argc,argv,FullText,8192); // this gets the rest of the arguments, from 1 to argc
WriteChatf("You passed the following text to the command:");
WriteChatf("%s",FullText);
robisowe wrote:How do I apply that code? I tried pasting it into a .patch file, but there are errors when trying to apply with tortoisemerge. I was able to make the changes manually, but just not sure how I am supposed to use that.
thanks
