MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename findPenPitAtCoord

develop
Chris Dombroski 2015-01-29 15:02:54 -05:00
parent 4e5325ba62
commit f2eec3198c
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
Unescape Escape View File

@ -29,7 +29,7 @@ DFHack Future
isPenPasture isPenPasture
isPitPond isPitPond
isActive isActive
findPenPitAtCoord findPenPitAt
Fixes Fixes
New Plugins New Plugins
New Scripts New Scripts

6
library/LuaApi.cpp
Unescape Escape View File

@ -1726,10 +1726,10 @@ static int buildings_findCivzonesAt(lua_State *L)
return 1; return 1;
} }
static int buildings_findPenPitAtCoord(lua_State *L) static int buildings_findPenPitAt(lua_State *L)
{ {
auto pos = CheckCoordXYZ(L, 1, true); auto pos = CheckCoordXYZ(L, 1, true);
Lua::PushDFObject(L, Buildings::findPenPitAtCoord(pos)); Lua::PushDFObject(L, Buildings::findPenPitAt(pos));
return 1; return 1;
} }
@ -1792,7 +1792,7 @@ static const luaL_Reg dfhack_buildings_funcs[] = {
{ "getCorrectSize", buildings_getCorrectSize }, { "getCorrectSize", buildings_getCorrectSize },
{ "setSize", &Lua::CallWithCatchWrapper<buildings_setSize> }, { "setSize", &Lua::CallWithCatchWrapper<buildings_setSize> },
{ "getStockpileContents", buildings_getStockpileContents}, { "getStockpileContents", buildings_getStockpileContents},
{ "findPenPitAt", buildings_findPenPitAtCoord}, { "findPenPitAt", buildings_findPenPitAt},
{ NULL, NULL } { NULL, NULL }
}; };

2
library/include/modules/Buildings.h
Unescape Escape View File

@ -296,6 +296,6 @@ DFHACK_EXPORT bool isPenPasture(df::building_civzonest * building);
DFHACK_EXPORT bool isPitPond(df::building_civzonest * building); DFHACK_EXPORT bool isPitPond(df::building_civzonest * building);
DFHACK_EXPORT bool isActive(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);
} }
} }

2
library/modules/Buildings.cpp
Unescape Escape View File

@ -1224,7 +1224,7 @@ bool Buildings::isActive(df::building_civzonest* civ)
} }
// returns building of pen/pit at cursor position (NULL if nothing found) // 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); CHECK_NULL_POINTER(coord);
vector<df::building_civzonest*> zones; vector<df::building_civzonest*> zones;

2
plugins/zone.cpp
Unescape Escape View File

@ -1995,7 +1995,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
} }
else else
{ {
target_building = findPenPitAtCoord(Gui::getCursorPos()); target_building = findPenPitAt(Gui::getCursorPos());
if(!target_building) if(!target_building)
{ {
out << "No pen/pasture or pit under cursor!" << endl; out << "No pen/pasture or pit under cursor!" << endl;