Commitdd91a16

committed

EngineSettings: Fix bugs with parsing of primary and actionbar

- We don't want to clear the primary stats, since this key is repeatable- Use the SLOT_MAX for upper bound when parsing actionbar

1 parentd71ea91 commitdd91a16Copy full SHA for dd91a16

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -608,9 +608,6 @@ void EngineSettings::HeroClasses::load() {`
`608`	`608`
`609`	`609`	`elseif (infile.key =="primary") {`
`610`	`610`	`// @ATTR primary\|predefined_string, int : Primary stat name, Default value\|Class starts with this value for the specified stat.`
`611`		`-current->primary.clear();`
`612`		`-current->primary.resize(eset->primary_stats.list.size(),0);`
`613`		`-`
`614`	`611`	`std::string prim_stat =Parse::popFirstString(infile.val);`
`615`	`612`	`size_t prim_stat_index = eset->primary_stats.getIndexByID(prim_stat);`
`616`	`613`
`@@ -626,7 +623,7 @@ void EngineSettings::HeroClasses::load() {`
`626`	`623`	`current->hotkeys.clear();`
`627`	`624`	`current->hotkeys.resize(MenuActionBar::SLOT_MAX,0);`
`628`	`625`
`629`		`-for (int i=0; i<12; i++) {`
	`626`	`+for (int i=0; i < MenuActionBar::SLOT_MAX; i++) {`
`630`	`627`	`current->hotkeys[i] =Parse::toPowerID(Parse::popFirstString(infile.val));`
`631`	`628`	`}`
`632`	`629`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ FLARE. If not, see http://www.gnu.org/licenses/`
`30`	`30`
`31`	`31`	`#include<SDL.h>`
`32`	`32`
`33`		`-VersionVersionInfo::ENGINE(1,14,198);`
	`33`	`+VersionVersionInfo::ENGINE(1,14,199);`
`34`	`34`	`VersionVersionInfo::MIN(0,0,0);`
`35`	`35`	`VersionVersionInfo::MAX(USHRT_MAX, USHRT_MAX, USHRT_MAX);`
`36`	`36`

Comments

(0)