|
|
@ -385,7 +385,11 @@ viewscreen_unitlaborsst::viewscreen_unitlaborsst(vector<df::unit*> &src, int cur
|
|
|
|
{
|
|
|
|
{
|
|
|
|
df::unit *unit = src[i];
|
|
|
|
df::unit *unit = src[i];
|
|
|
|
if (!unit)
|
|
|
|
if (!unit)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (cursor_pos > i)
|
|
|
|
|
|
|
|
cursor_pos--;
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
UnitInfo *cur = new UnitInfo;
|
|
|
|
UnitInfo *cur = new UnitInfo;
|
|
|
|
|
|
|
|
|
|
|
@ -628,6 +632,9 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
|
|
|
|
sel_row = units.size() - 1;
|
|
|
|
sel_row = units.size() - 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (events->count(interface_key::STRING_A000))
|
|
|
|
|
|
|
|
sel_row = 0;
|
|
|
|
|
|
|
|
|
|
|
|
if (sel_row < first_row)
|
|
|
|
if (sel_row < first_row)
|
|
|
|
first_row = sel_row;
|
|
|
|
first_row = sel_row;
|
|
|
|
if (first_row < sel_row - num_rows + 1)
|
|
|
|
if (first_row < sel_row - num_rows + 1)
|
|
|
@ -661,6 +668,9 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
|
|
|
|
sel_column = next;
|
|
|
|
sel_column = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (events->count(interface_key::STRING_A000))
|
|
|
|
|
|
|
|
sel_column = 0;
|
|
|
|
|
|
|
|
|
|
|
|
if (sel_column < 0)
|
|
|
|
if (sel_column < 0)
|
|
|
|
sel_column = 0;
|
|
|
|
sel_column = 0;
|
|
|
|
if (sel_column > NUM_COLUMNS - 1)
|
|
|
|
if (sel_column > NUM_COLUMNS - 1)
|
|
|
|