From 3e44aabf12cc0ee0ca3d811e44bc77db622b18bf Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 25 Feb 2016 15:19:35 -0500 Subject: [PATCH] Expose Units::getSquadName to lua --- library/LuaApi.cpp | 1 + library/modules/Units.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp index 3e2661984..b7d5bdfb9 100644 --- a/library/LuaApi.cpp +++ b/library/LuaApi.cpp @@ -1531,6 +1531,7 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = { WRAPM(Units, getCasteProfessionName), WRAPM(Units, getProfessionColor), WRAPM(Units, getCasteProfessionColor), + WRAPM(Units, getSquadName), WRAPM(Units, isWar), WRAPM(Units, isHunter), WRAPM(Units, isAvailableForAdoption), diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index 341a90b22..da8510e82 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -1799,6 +1799,7 @@ int8_t Units::getCasteProfessionColor(int race, int casteid, df::profession pid) std::string Units::getSquadName(df::unit *unit) { + CHECK_NULL_POINTER(unit); if (unit->military.squad_id == -1) return ""; df::squad *squad = df::squad::find(unit->military.squad_id);