From 28e70516a40b3c1e2557fc0bb8e1a13d355a040f Mon Sep 17 00:00:00 2001
From: BeniS <dolb90@gmail.com>
Date: Sat, 23 Feb 2013 19:23:18 +1300
Subject: [PATCH] Use full path in SpelllistSettings * Fix reload errors from
 previous commit

---
 modules/game_cooldown/cooldown.lua   | 2 +-
 modules/game_spelllist/spelllist.lua | 2 +-
 modules/gamelib/spells.lua           | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/game_cooldown/cooldown.lua b/modules/game_cooldown/cooldown.lua
index 24efc583..7c42600f 100644
--- a/modules/game_cooldown/cooldown.lua
+++ b/modules/game_cooldown/cooldown.lua
@@ -57,7 +57,7 @@ function loadIcon(iconId)
     icon:setId(iconId)
   end
 
-  icon:setImageSource('/images/game/spells/'..SpelllistSettings[profile].iconFile)
+  icon:setImageSource(SpelllistSettings[profile].iconFile)
   icon:setImageClip(Spells.getImageClip(clientIconId, profile))
   return icon
 end
diff --git a/modules/game_spelllist/spelllist.lua b/modules/game_spelllist/spelllist.lua
index e80e1bbd..eaa96e3c 100644
--- a/modules/game_spelllist/spelllist.lua
+++ b/modules/game_spelllist/spelllist.lua
@@ -205,7 +205,7 @@ function initialiseSpelllist()
   
     tmpLabel:setHeight(SpelllistSettings[SpelllistProfile].iconSize.height + 4)
     tmpLabel:setTextOffset(topoint((SpelllistSettings[SpelllistProfile].iconSize.width + 10) .. ' ' .. (SpelllistSettings[SpelllistProfile].iconSize.height - 32)/2 + 3))
-    tmpLabel:setImageSource('/images/game/spells/' .. SpelllistSettings[SpelllistProfile].iconFile)
+    tmpLabel:setImageSource(SpelllistSettings[SpelllistProfile].iconFile)
     tmpLabel:setImageClip(Spells.getImageClip(iconId, SpelllistProfile))
     tmpLabel:setImageSize(tosize(SpelllistSettings[SpelllistProfile].iconSize.width .. ' ' .. SpelllistSettings[SpelllistProfile].iconSize.height))
     tmpLabel.onClick = updateSpellInformation
diff --git a/modules/gamelib/spells.lua b/modules/gamelib/spells.lua
index 09c3b993..2b620e06 100644
--- a/modules/gamelib/spells.lua
+++ b/modules/gamelib/spells.lua
@@ -1,17 +1,17 @@
 SpelllistSettings = {
   ['Default'] = { 
-    iconFile = 'defaultspells',
+    iconFile = '/images/game/spells/defaultspells',
     iconSize = {width = 32, height = 32},
     spellListWidth = 210,
     spellWindowWidth = 550,
     spellOrder = {'Animate Dead', 'Annihilation', 'Avalanche', 'Berserk', 'Blood Rage', 'Brutal Strike', 'Cancel Invisibility', 'Challenge', 'Chameleon', 'Charge', 'Conjure Arrow', 'Conjure Bolt', 'Conjure Explosive Arrow', 'Conjure Piercing Bolt', 'Conjure Poisoned Arrow', 'Conjure Power Bolt', 'Conjure Sniper Arrow', 'Convince Creature', 'Creature Illusion', 'Cure Bleeding', 'Cure Burning', 'Cure Curse', 'Cure Electrification', 'Cure Poison', 'Cure Poison Rune', 'Curse', 'Death Strike', 'Desintegrate', 'Destroy Field', 'Divine Caldera', 'Divine Healing', 'Divine Missile', 'Electrify', 'Enchant Party', 'Enchant Spear', 'Enchant Staff', 'Energy Beam', 'Energy Field', 'Energy Strike', 'Energy Wall', 'Energy Wave', 'Energybomb', 'Envenom', 'Eternal Winter', 'Ethereal Spear', 'Explosion', 'Fierce Berserk', 'Find Person', 'Fire Field', 'Fire Wall', 'Fire Wave', 'Fireball', 'Firebomb', 'Flame Strike', 'Food', 'Front Sweep', 'Great Energy Beam', 'Great Fireball', 'Great Light', 'Groundshaker', 'Haste', 'Heal Friend', 'Heal Party', 'Heavy Magic Missile', 'Hells Core', 'Holy Flash', 'Holy Missile', 'Ice Strike', 'Ice Wave', 'Icicle', 'Ignite', 'Inflict Wound', 'Intense Healing', 'Intense Healing Rune', 'Intense Recovery', 'Intense Wound Cleansing', 'Invisibility', 'Levitate', 'Light', 'Light Healing', 'Light Magic Missile', 'Lightning', 'Magic Rope', 'Magic Shield', 'Magic Wall', 'Mass Healing', 'Paralyze', 'Physical Strike', 'Poison Bomb', 'Poison Field', 'Poison Wall', 'Protect Party', 'Protector', 'Rage of the Skies', 'Recovery', 'Salvation', 'Sharpshooter', 'Soulfire', 'Stalagmite', 'Stone Shower', 'Strong Energy Strike', 'Strong Ethereal Spear', 'Strong Flame Strike', 'Strong Haste', 'Strong Ice Strike', 'Strong Ice Wave', 'Strong Terra Strike', 'Sudden Death', 'Summon Creature', 'Swift Foot', 'Terra Strike', 'Terra Wave', 'Thunderstorm', 'Train Party', 'Ultimate Energy Strike', 'Ultimate Flame Strike', 'Ultimate Healing', 'Ultimate Healing Rune', 'Ultimate Ice Strike', 'Ultimate Light', 'Ultimate Terra Strike', 'Whirlwind Throw', 'Wild Growth', 'Wound Cleansing', 'Wrath of Nature'}
-  },
+  }--[[,
   
   ['Sample'] =  { 
-    iconFile = 'sample', 
+    iconFile = '/images/game/spells/sample', 
     iconSize = {width = 64, height = 64},
     spellOrder = {'Critical Strike', 'Firefly', 'Fire Breath', 'Moonglaives', 'Wind Walk'}
-  }
+  }]]
 }
 
 SpellInfo = {