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

Set priority over manipulator plugin 

Include animal type is search
develop
Anuradha Dissanayake 2012-10-22 21:44:02 +13:00
parent c433a8eeff
commit 2fcceaa65e
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/search.cpp
Unescape Escape View File

@ -7,9 +7,10 @@
#include <VTableInterpose.h> #include <VTableInterpose.h>
#include "df/viewscreen_unitlistst.h" #include "df/viewscreen_petst.h"
#include "df/viewscreen_storesst.h" #include "df/viewscreen_storesst.h"
#include "df/viewscreen_tradegoodsst.h" #include "df/viewscreen_tradegoodsst.h"
#include "df/viewscreen_unitlistst.h"
#include "df/interface_key.h" #include "df/interface_key.h"
using std::set; using std::set;
@ -431,12 +432,16 @@ public:
private: private:
virtual string get_element_description(df::unit *element) const virtual string get_element_description(df::unit *element) const
{ {
return Translation::TranslateName(Units::getVisibleName(element), false); string desc = Translation::TranslateName(Units::getVisibleName(element), false);
if (viewscreen->page == 1)
desc += Units::getProfessionName(element);
return desc;
} }
virtual bool should_check_input(set<df::interface_key> *input) virtual bool should_check_input(set<df::interface_key> *input)
{ {
if (input->count(interface_key::CURSOR_LEFT) || input->count(interface_key::CURSOR_RIGHT)) if (input->count(interface_key::CURSOR_LEFT) || input->count(interface_key::CURSOR_RIGHT) || input->count(interface_key::CUSTOM_L))
{ {
if (!is_entry_mode()) if (!is_entry_mode())
{ {
@ -455,14 +460,22 @@ private:
}; };
typedef search_hook<df::viewscreen_unitlistst, unitlist_search> unitlist_search_hook; typedef search_hook<df::viewscreen_unitlistst, unitlist_search> unitlist_search_hook;
IMPLEMENT_VMETHOD_INTERPOSE(unitlist_search_hook, feed); IMPLEMENT_VMETHOD_INTERPOSE_PRIO(unitlist_search_hook, feed, 100);
IMPLEMENT_VMETHOD_INTERPOSE(unitlist_search_hook, render); IMPLEMENT_VMETHOD_INTERPOSE_PRIO(unitlist_search_hook, render, 100);
// //
// END: Unit screen search // END: Unit screen search
// //
//
// TODO: Animals screen search
//
//
// END: Animals screen search
//
// //
// START: Trade screen search // START: Trade screen search
// //