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

fix for updated viewlist_petst

develop
jj 2012-09-26 18:13:01 +02:00
parent d975ce5135
commit 7cc29250f8
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -766,7 +766,7 @@ static df::unit *getAnyUnit(df::viewscreen *top)
{
case df::viewscreen_petst::List:
if (!vector_get(screen->is_vermin, screen->cursor))
return (df::unit*)vector_get(screen->animal, screen->cursor);
return vector_get(screen->animal, screen->cursor).unit;
return NULL;
case df::viewscreen_petst::SelectTrainer:

14
plugins/ruby/unit.rb
Unescape Escape View File

@ -12,9 +12,15 @@ module DFHack
ref.unit_tg if ref.kind_of?(GeneralRefUnit)
when :viewscreen_unitlistst
v = curview
# TODO fix xml to use enums everywhere
page = DFHack::ViewscreenUnitlistst_TPage.int(v.page)
v.units[page][v.cursor_pos[page]]
v.units[v.page][v.cursor_pos[v.page]]
when :viewscreen_petst
v = curview
case v.mode
when :List
v.animal[v.cursor].unit if !v.is_vermin[v.cursor]
when :SelectTrainer
v.trainer_unit[v.trainer_cursor]
end
else
case ui.main.mode
when :ViewUnits
@ -48,7 +54,7 @@ module DFHack
}
end
def unit_iscitizen(u)
def unit_iscitizen(u)
u.race == ui.race_id and u.civ_id == ui.civ_id and !u.flags1.dead and !u.flags1.merchant and !u.flags1.forest and
!u.flags1.diplomat and !u.flags2.resident and !u.flags3.ghostly and
!u.curse.add_tags1.OPPOSED_TO_LIFE and !u.curse.add_tags1.CRAZED and

2
plugins/sort.cpp
Unescape Escape View File

@ -356,7 +356,7 @@ DEFINE_SORT_HANDLER(unit_sorters, pet, "/List", animals)
std::vector<df::unit*> units;
for (size_t i = 0; i < animals->animal.size(); i++)
units.push_back(animals->is_vermin[i] ? NULL : (df::unit*)animals->animal[i]);
units.push_back(animals->is_vermin[i] ? NULL : animals->animal[i].unit);
if (compute_order(*pout, L, top, &order, units))
{