Commit 95caf2fd authored by Red Bot's avatar Red Bot

Merge branch 'master' into 'patchday'

Master

See merge request !350
parents a8d74ca5 b544422d
......@@ -290,7 +290,7 @@ BOOL AddMacroLine(PCHAR FileName, PCHAR szLine, size_t Linelen, int *LineNumber,
CHAR Filename[MAX_STRING] = { 0 };
szLine += 8;
while (szLine[0] == ' ') szLine++;
ParseMacroData(szLine, sizeof(szLine));
if (!strstr(szLine, "."))
strcat_s(szLine, Linelen, ".mac");
sprintf_s(Filename, "%s\\%s", gszMacroPath, szLine);
......
Subproject commit 1fa92c60f3cce27db5aad17d5853ad2b0dd4224c
Subproject commit 4a94f31add7d4ccf3b0e67facac9e3c6af03a571
Subproject commit 5b3787d9fbc6f3cf50cb80b81023360e31094666
Subproject commit da48126a4cd27a208c34fc880c91790039c31806
......@@ -376,14 +376,14 @@ void StatusCmd(SPAWNINFO* pChar, char* szLine)
LabeledText("Health Pct", PercentHealth(me));
}
else if (!_stricmp(Arg, "mana")) {
stringBuffer += LabeledText("Current Mana", me->GetCurrentMana()) + " " +
LabeledText("Current Mana", me->GetMaxMana()) + " " +
LabeledText("Mana Pct", PercentMana(me));
stringBuffer += LabeledText("Current Mana", me->GetCurrentMana()) +
LabeledText(" Max Mana", me->GetMaxMana()) +
LabeledText(" Mana Pct", PercentMana(me));
}
else if (!_stricmp(Arg, "endurance")) {
stringBuffer += LabeledText("Current Endurance", me->GetCurrentEndurance()) + " " +
LabeledText("Current Endurance", me->GetMaxEndurance()) + " " +
LabeledText("Endurance Pct", PercentEndurance(me));
stringBuffer += LabeledText("Current Endurance", me->GetCurrentEndurance()) +
LabeledText(" Max Endurance", me->GetMaxEndurance()) +
LabeledText(" Endurance Pct", PercentEndurance(me));
}
else if (!_stricmp(Arg, "money") || !_stricmp(Arg, "plat")) {
char szmyPlat[MAX_STRING] = "";
......@@ -418,7 +418,7 @@ void StatusCmd(SPAWNINFO* pChar, char* szLine)
return;
}
// We don't appear to have a way to access the inforamtion direclty so I'm accessing the tribute window
// We don't appear to have a way to access the information directly so I'm accessing the tribute window
if (!_stricmp(Arg, "gtribute") || !_stricmp(Arg, "guildtribute")) {
if (CXWnd* TributeBenefitWnd = FindMQ2Window("TributeBenefitWnd")) {
if (CLabelWnd* GuildTributeStatus = (CLabelWnd*)TributeBenefitWnd->GetChildItem("TBWG_ActivateButton")) {
......
......@@ -344,7 +344,7 @@ PLUGIN_API VOID OnPulse()
{
if (pXTarget->Type == SPAWN_NPC)
{
int slot = GetXTargetSlotByID(AssistID);
int slot = GetXTargetSlotByID(pXTarget->SpawnID);
if (slot == -1) //not on there already so lets add it
{
slot = FindEmptyXTargetSlot();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment