diff --git a/NEWS b/NEWS index 136f35f6b..e032c87f6 100644 --- a/NEWS +++ b/NEWS @@ -29,7 +29,7 @@ DFHack Future isPenPasture isPitPond isActive - findPenPitAtCoord + findPenPitAt Fixes New Plugins New Scripts diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp index 30789fce2..5568f2f66 100644 --- a/library/LuaApi.cpp +++ b/library/LuaApi.cpp @@ -1726,10 +1726,10 @@ static int buildings_findCivzonesAt(lua_State *L) return 1; } -static int buildings_findPenPitAtCoord(lua_State *L) +static int buildings_findPenPitAt(lua_State *L) { auto pos = CheckCoordXYZ(L, 1, true); - Lua::PushDFObject(L, Buildings::findPenPitAtCoord(pos)); + Lua::PushDFObject(L, Buildings::findPenPitAt(pos)); return 1; } @@ -1792,7 +1792,7 @@ static const luaL_Reg dfhack_buildings_funcs[] = { { "getCorrectSize", buildings_getCorrectSize }, { "setSize", &Lua::CallWithCatchWrapper }, { "getStockpileContents", buildings_getStockpileContents}, - { "findPenPitAt", buildings_findPenPitAtCoord}, + { "findPenPitAt", buildings_findPenPitAt}, { NULL, NULL } }; diff --git a/library/include/modules/Buildings.h b/library/include/modules/Buildings.h index 7aff53a72..a98c6c16d 100644 --- a/library/include/modules/Buildings.h +++ b/library/include/modules/Buildings.h @@ -296,6 +296,6 @@ DFHACK_EXPORT bool isPenPasture(df::building_civzonest * building); DFHACK_EXPORT bool isPitPond(df::building_civzonest * building); DFHACK_EXPORT bool isActive(df::building_civzonest * building); -DFHACK_EXPORT df::building* findPenPitAtCoord(df::coord coord); +DFHACK_EXPORT df::building* findPenPitAt(df::coord coord); } } diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp index ced787733..27ec0e5d3 100644 --- a/library/modules/Buildings.cpp +++ b/library/modules/Buildings.cpp @@ -1224,7 +1224,7 @@ bool Buildings::isActive(df::building_civzonest* civ) } // returns building of pen/pit at cursor position (NULL if nothing found) -df::building* Buildings::findPenPitAtCoord(df::coord coord) +df::building* Buildings::findPenPitAt(df::coord coord) { CHECK_NULL_POINTER(coord); vector zones; diff --git a/plugins/zone.cpp b/plugins/zone.cpp index 68b93d806..4fcc911f6 100644 --- a/plugins/zone.cpp +++ b/plugins/zone.cpp @@ -1995,7 +1995,7 @@ command_result df_zone (color_ostream &out, vector & parameters) } else { - target_building = findPenPitAtCoord(Gui::getCursorPos()); + target_building = findPenPitAt(Gui::getCursorPos()); if(!target_building) { out << "No pen/pasture or pit under cursor!" << endl;