@@ -9114,10 +9114,7 @@ Sub Main
| -------------------------------------------------------------------------------------
| SUB: Bind MemMySpells
| -------------------------------------------------------------------------------------
- Sub Bind_MemMySpells(Message)
- /declare temppCharName string local
- /declare pCharName string local ${Message}
- /declare tempIniFileName string local
+ Sub Bind_MemMySpells
/declare pKV string local
/declare i int local
/declare ii int local
@@ -9125,35 +9122,21 @@ Sub Main
/declare tempSpellName string local
/if (${Debug}) /echo \atDEBUG MemMySpells: Enter \agLine#: ${Macro.CurLine}
- /if (!${pCharName.Length} || ${pCharName.Equal[null]}) {
- /varset temppCharName ${Me.CleanName}
- } else {
- /varset temppCharName ${pCharName}
- }
- /if (${temppCharName.NotEqual[${Me.CleanName}]}) {
- /if (${Ini[${MacroName}_${EverQuest.Server}_${temppCharName}.ini,General,KissAssistVer].Length}) {
- /varset tempIniFileName ${MacroName}_${EverQuest.Server}_${temppCharName}.ini
- /echo Server Name ini file detected using ${tempIniFileName}
- } else {
- /varset tempIniFileName ${MacroName}_${temppCharName}.ini
- }
- } else /if (!${PIniSet}) {
- /varset tempIniFileName ${MacroName}_${temppCharName}.ini
- } else {
- /varset tempIniFileName ${IniFileName}
- }
- /varset pKV ${Ini[${tempIniFileName},General,KissAssistVer]}
+
+ /varset pKV ${Ini[${IniFileName},General,KissAssistVer]}
+
/if (${Int[${pKV}]}==0) {
- /echo Invalid INI file: ${tempIniFileName} for memorizing spells. Returning.
+ /echo Invalid INI file: ${IniFileName} for memorizing spells. Returning.
/return
}
- /varset pKV ${Ini[${tempIniFileName},"MySpells",Gem1]}
+
+ /varset pKV ${Ini[${IniFileName},"MySpells",Gem1]}
/if (${Int[${pKV.Length}]}==0) {
- /echo No Spells found in INI file: ${tempIniFileName}. Use /writespells and try again. Returning.
+ /echo No Spells found in INI file: ${IniFileName}. Use /writespells and try again. Returning.
/return
}
/for i 1 to 13
- /varset SpellToMem ${Ini[${tempIniFileName},"MySpells",Gem${i}]}
+ /varset SpellToMem ${Ini[${IniFileName},"MySpells",Gem${i}]}
/if (${SpellToMem.Length} && ${SpellToMem.NotEqual[null]}) {
/if (${SpellToMem.Find[ Rk.]}) {
/varset tempSpellName ${SpellToMem.Left[${Math.Calc[${SpellToMem.Find[ Rk.]}-1]}]}
@@ -9456,13 +9439,13 @@ Sub Main
}
/next GemNum
/if (${LoadSpellSet}==2 && ${ValidSpells}==0) /echo You have no valid spells defined in your ini file [MySpells], load your spells now and do a /writespells command while in KissAsssist.
- /if (${LoadSpellSet}==2 && ${ValidSpells}==1) /call Bind_MemMySpells ${Me.CleanName}
+ /if (${LoadSpellSet}==2 && ${ValidSpells}==1) /call Bind_MemMySpells
}
|-- If we called this routine, make sure we update values for ReMemMiscSpell and ReMemMiscSpellLW since they might have changed after spellset load.
/varset ReMemMiscSpell ${Me.Gem[${MiscGem}].Name}
/varset ReMemMiscSpellLW ${Me.Gem[${MiscGemLW}].Name}
/if (${Debug}) /echo \atDEBUGBUFFS LoadSpellSet Leave \agLine#: ${Macro.CurLine}
- /return
+ /return
| ----------------------------------------------------------------------------
| SUB: Set Window Title Buffs
| ----------------------------------------------------------------------------