Fix some off-by-one errors in Item config.

RosaryMala · RosaryMala · commit 5b7e7743a137 · 2020-04-30T23:45:37.000-07:00
diff --git a/ItemConfiguration.cpp b/ItemConfiguration.cpp
@@ -104,13 +104,11 @@ bool parseItemElement( TiXmlElement* elemRoot, int basefile)
 
 void flushItemConfig(vector<std::unique_ptr<ItemConfiguration>> &config)
 {
-    uint32_t currentsize = (uint32_t)config.size();
-    if (currentsize < ENUM_LAST_ITEM(item_type)) {
-        currentsize = ENUM_LAST_ITEM(item_type);
-    }
+    if (config.size() != (ENUM_LAST_ITEM(item_type) + 1))
+        config.resize(ENUM_LAST_ITEM(item_type) + 1);
 
-    config.clear();
-    while (currentsize < config.size()) {
-        config.push_back(nullptr);
+    for (size_t i = 0; i < config.size(); i++)
+    {
+        config[i] = nullptr;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -104,13 +104,11 @@ bool parseItemElement( TiXmlElement* elemRoot, int basefile)`
`104`	`104`
`105`	`105`	`void flushItemConfig(vector<std::unique_ptr<ItemConfiguration>> &config)`
`106`	`106`	`{`
`107`		`- uint32_t currentsize = (uint32_t)config.size();`
`108`		`- if (currentsize < ENUM_LAST_ITEM(item_type)) {`
`109`		`- currentsize = ENUM_LAST_ITEM(item_type);`
`110`		`- }`
	`107`	`+ if (config.size() != (ENUM_LAST_ITEM(item_type) + 1))`
	`108`	`+ config.resize(ENUM_LAST_ITEM(item_type) + 1);`
`111`	`109`
`112`		`- config.clear();`
`113`		`- while (currentsize < config.size()) {`
`114`		`- config.push_back(nullptr);`
	`110`	`+ for (size_t i = 0; i < config.size(); i++)`
	`111`	`+ {`
	`112`	`+ config[i] = nullptr;`
`115`	`113`	`}`
`116`	`114`	`}`