incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't allow creeating x0 stacks with $item

Browse Source
This commit is contained in:
Martin Michelsen
2023-12-17 17:43:54 -08:00
parent 7a34fb0f7a
commit 8b0f62f71e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ItemNameIndex.cc
+7 -4
View File
@@ -363,11 +363,12 @@ std::string ItemNameIndex::describe_item(
} }
ItemData ItemNameIndex::parse_item_description(Version version, const std::string& desc) const { ItemData ItemNameIndex::parse_item_description(Version version, const std::string& desc) const {
ItemData ret;
try { try {
return this->parse_item_description_phase(version, desc, false); ret = this->parse_item_description_phase(version, desc, false);
} catch (const exception& e1) { } catch (const exception& e1) {
try { try {
return this->parse_item_description_phase(version, desc, true); ret = this->parse_item_description_phase(version, desc, true);
} catch (const exception& e2) { } catch (const exception& e2) {
try { try {
string data = parse_data_string(desc); string data = parse_data_string(desc);
@@ -381,14 +382,12 @@ ItemData ItemNameIndex::parse_item_description(Version version, const std::strin
throw runtime_error("item code too long"); throw runtime_error("item code too long");
} }
ItemData ret;
if (data.size() <= 12) { if (data.size() <= 12) {
memcpy(ret.data1.data(), data.data(), data.size()); memcpy(ret.data1.data(), data.data(), data.size());
} else { } else {
memcpy(ret.data1.data(), data.data(), 12); memcpy(ret.data1.data(), data.data(), 12);
memcpy(ret.data2.data(), data.data() + 12, data.size() - 12); memcpy(ret.data2.data(), data.data() + 12, data.size() - 12);
} }
return ret;
} catch (const exception& ed) { } catch (const exception& ed) {
if (strcmp(e1.what(), e2.what())) { if (strcmp(e1.what(), e2.what())) {
throw runtime_error(string_printf("cannot parse item description (as text 1: %s) (as text 2: %s) (as data: %s)", e1.what(), e2.what(), ed.what())); throw runtime_error(string_printf("cannot parse item description (as text 1: %s) (as text 2: %s) (as data: %s)", e1.what(), e2.what(), ed.what()));
@@ -398,6 +397,10 @@ ItemData ItemNameIndex::parse_item_description(Version version, const std::strin
} }
} }
} }
if (ret.stack_size() == 0) {
ret.data1[5] = 1;
}
return ret;
} }
ItemData ItemNameIndex::parse_item_description_phase(Version version, const std::string& description, bool skip_special) const { ItemData ItemNameIndex::parse_item_description_phase(Version version, const std::string& description, bool skip_special) const {