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

fix variance on specialized boxes

Browse Source
This commit is contained in:
Martin Michelsen
2023-11-15 16:02:31 -08:00
parent f997376819
commit 768bdb5b05
6 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Map.cc
+2 -1
View File
@@ -30,7 +30,7 @@ string Map::Object::str(shared_ptr<const ItemNameIndex> name_index) const {
if (this->param1 <= 0.0f) {
string item_name;
try {
auto item = ItemCreator::item_for_specialized_box(this->param4, this->param5, this->param6);
auto item = ItemCreator::base_item_for_specialized_box(this->param4, this->param5, this->param6);
item_name = name_index ? name_index->describe_item(GameVersion::BB, item) : item.hex();
} catch (const exception& e) {
item_name = string_printf("(failed: %s)", e.what());
@@ -61,6 +61,7 @@ void Map::add_objects_from_map_data(uint8_t floor, const void* data, size_t size
.base_type = objects[z].base_type,
.section = objects[z].section,
.param1 = objects[z].param1,
.param3 = objects[z].param3,
.param4 = objects[z].param4,
.param5 = objects[z].param5,
.param6 = objects[z].param6,