From: <th...@us...> - 2009-07-01 23:04:41
|
Revision: 10001 http://pcgen.svn.sourceforge.net/pcgen/?rev=10001&view=rev Author: thpr Date: 2009-07-01 23:04:40 +0000 (Wed, 01 Jul 2009) Log Message: ----------- Eliminate Key comparison of Spell objects Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java Modified: Trunk/pcgen/code/src/java/pcgen/core/PCClass.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2009-07-01 22:53:18 UTC (rev 10000) +++ Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2009-07-01 23:04:40 UTC (rev 10001) @@ -1178,10 +1178,10 @@ * PCCLASSLEVELONLY This calculation is dependent upon the class level * and is therefore appropriate only for PCClassLevel */ - public boolean isAutoKnownSpell(final String spellName, + public boolean isAutoKnownSpell(Spell spell, final int spellLevel, final PlayerCharacter aPC) { - return isAutoKnownSpell(spellName, spellLevel, false, aPC); + return isAutoKnownSpell(spell, spellLevel, false, aPC); } public void setLevel(final int newLevel, final PlayerCharacter aPC) @@ -1319,7 +1319,7 @@ } final boolean isKnownAtThisLevel = - isAutoKnownSpell(aSpell.getKeyName(), spellLevel, true, + isAutoKnownSpell(aSpell, spellLevel, true, aPC); if (!isKnownAtThisLevel) @@ -1377,7 +1377,7 @@ if (spellLevel <= _maxLevel) { // If the spell is autoknown at this level - if (isAutoKnownSpell(spell.getKeyName(), spellLevel, + if (isAutoKnownSpell(spell, spellLevel, true, aPC)) { CharacterSpell cs = @@ -3023,7 +3023,7 @@ * PCCLASSLEVELONLY This calculation is dependent upon the class level * and is therefore appropriate only for PCClassLevel */ - private boolean isAutoKnownSpell(final String aSpellKey, + private boolean isAutoKnownSpell(Spell aSpell, final int spellLevel, final boolean useMap, final PlayerCharacter aPC) { List<KnownSpellIdentifier> knownSpellsList = getListFor(ListKey.KNOWN_SPELLS); @@ -3032,8 +3032,6 @@ return false; } - final Spell aSpell = Globals.getSpellKeyed(aSpellKey); - if (useMap) { final Integer val = castForLevelMap.get(spellLevel); Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2009-07-01 22:53:18 UTC (rev 10000) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2009-07-01 23:04:40 UTC (rev 10001) @@ -8897,7 +8897,7 @@ // there is some weird spell that keeps getting loaded by // accident (or is saved in the .pcg file) if (isDefault - && aClass.isAutoKnownSpell(acs.getSpell().getKeyName(), si + && aClass.isAutoKnownSpell(acs.getSpell(), si .getActualLevel(), this)) { Logging.errorPrint("Notice: removing " Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java 2009-07-01 22:53:18 UTC (rev 10000) +++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java 2009-07-01 23:04:40 UTC (rev 10001) @@ -1998,8 +1998,8 @@ if (spellInfo.getBook().equals( Globals.getDefaultSpellBook()) - && pcClass.isAutoKnownSpell(cSpell.getSpell() - .getKeyName(), SpellLevel.getFirstLevelForKey( + && pcClass.isAutoKnownSpell(cSpell.getSpell(), + SpellLevel.getFirstLevelForKey( cSpell.getSpell(), lists, thePC), thePC) && thePC.getAutoSpells()) { Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2009-07-01 22:53:18 UTC (rev 10000) +++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2009-07-01 23:04:40 UTC (rev 10001) @@ -4123,7 +4123,7 @@ // do not load auto knownspells into default spellbook if (spellBook.equals(Globals.getDefaultSpellBook()) - && aPCClass.isAutoKnownSpell(aSpell.getKeyName(), level, thePC) + && aPCClass.isAutoKnownSpell(aSpell, level, thePC) && thePC.getAutoSpells()) { continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |