From 9a378496038d15f391148e863054bfc9af4d8de1 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Sat, 7 Dec 2019 22:41:55 -0800 Subject: [PATCH] use symbols.xml --- library/modules/Units.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index 5fec1c0a3..5a50d4069 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -541,13 +541,21 @@ string Units::getRaceName(df::unit* unit) return getRaceNameById(unit->race); } -typedef void (*df_unit_desc_fn)(df::unit*, std::string*); -static df_unit_desc_fn df_unit_desc = reinterpret_cast(0x100cbb890); +typedef void (*df_unit_physical_description_fn)(df::unit*, string*); +void df_unit_physical_description(df::unit* unit, string* out_str) +{ + static df_unit_physical_description_fn fn = + reinterpret_cast( + Core::getInstance().vinfo->getAddress("unit_physical_description")); + if (fn) + fn(unit, out_str); +} + string Units::getDescription(df::unit* unit) { CHECK_NULL_POINTER(unit); - std::string str; - df_unit_desc(unit, &str); + string str; + df_unit_physical_description(unit, &str); return str; }