diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp index 5dc881926..7c3ef965d 100644 --- a/library/LuaApi.cpp +++ b/library/LuaApi.cpp @@ -1611,7 +1611,7 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = { WRAPM(Units, isOwnCiv), WRAPM(Units, isOwnGroup), WRAPM(Units, isOwnRace), - WRAPM(Units, getDescription), + WRAPM(Units, getPhysicalDescription), WRAPM(Units, getRaceName), WRAPM(Units, getRaceNamePlural), WRAPM(Units, getRaceBabyName), diff --git a/library/include/modules/Units.h b/library/include/modules/Units.h index 49565960d..f5995583b 100644 --- a/library/include/modules/Units.h +++ b/library/include/modules/Units.h @@ -120,7 +120,7 @@ DFHACK_EXPORT bool isVisible(df::unit* unit); DFHACK_EXPORT std::string getRaceNameById(int32_t race_id); DFHACK_EXPORT std::string getRaceName(df::unit* unit); -DFHACK_EXPORT std::string getDescription(df::unit* unit); +DFHACK_EXPORT std::string getPhysicalDescription(df::unit* unit); DFHACK_EXPORT std::string getRaceNamePluralById(int32_t race_id); DFHACK_EXPORT std::string getRaceNamePlural(df::unit* unit); DFHACK_EXPORT std::string getRaceBabyNameById(int32_t race_id); diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index 82d5e04d2..2b7243f05 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -550,7 +550,7 @@ void df_unit_physical_description(df::unit* unit, string* out_str) fn(unit, out_str); } -string Units::getDescription(df::unit* unit) +string Units::getPhysicalDescription(df::unit* unit) { CHECK_NULL_POINTER(unit); string str; diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/proto/RemoteFortressReader.proto index 6b70a48cb..a61bfbe21 100644 --- a/plugins/proto/RemoteFortressReader.proto +++ b/plugins/proto/RemoteFortressReader.proto @@ -420,7 +420,7 @@ message UnitAppearance optional Hair beard = 6; optional Hair moustache = 7; optional Hair sideburns = 8; - optional string description = 9; + optional string physical_description = 9; } message InventoryItem diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp index 3efcd80a5..dd338c705 100644 --- a/plugins/remotefortressreader/remotefortressreader.cpp +++ b/plugins/remotefortressreader/remotefortressreader.cpp @@ -1750,7 +1750,7 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques appearance->add_colors(unit->appearance.colors[j]); appearance->set_size_modifier(unit->appearance.size_modifier); - appearance->set_description(Units::getDescription(unit)); + appearance->set_physical_description(Units::getPhysicalDescription(unit)); send_unit->set_profession_id(unit->profession);