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

Prioritizing search hooks on the trade screen. 

The autotrade plugin has been intercepting the m/u/M/U keys if enabled after enabling the search plugin.  An explicit priority makes the search plugin always accept those keys while typing in a search line.
develop
Eric Wald 2014-08-25 21:18:52 -06:00
parent 2b59f0edca
commit 6d9d616fff
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/search.cpp
Unescape Escape View File

@ -693,10 +693,10 @@ template <class T, class V, int D> V generic_search_hook<T, V, D> ::module;
// Hook definition helpers // Hook definition helpers
#define IMPLEMENT_HOOKS_WITH_ID(screen, module, id) \ #define IMPLEMENT_HOOKS_WITH_ID(screen, module, id, prio) \
typedef generic_search_hook<screen, module, id> module##_hook; \ typedef generic_search_hook<screen, module, id> module##_hook; \
template<> IMPLEMENT_VMETHOD_INTERPOSE(module##_hook, feed); \ template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(module##_hook, feed, prio); \
template<> IMPLEMENT_VMETHOD_INTERPOSE(module##_hook, render) template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(module##_hook, render, prio)
#define IMPLEMENT_HOOKS(screen, module) \ #define IMPLEMENT_HOOKS(screen, module) \
typedef generic_search_hook<screen, module> module##_hook; \ typedef generic_search_hook<screen, module> module##_hook; \
@ -1108,7 +1108,7 @@ private:
} }
}; };
IMPLEMENT_HOOKS_WITH_ID(df::viewscreen_tradegoodsst, trade_search_merc, 1); IMPLEMENT_HOOKS_WITH_ID(df::viewscreen_tradegoodsst, trade_search_merc, 1, 100);
class trade_search_fort : public trade_search_base class trade_search_fort : public trade_search_base
@ -1150,7 +1150,7 @@ private:
} }
}; };
IMPLEMENT_HOOKS_WITH_ID(df::viewscreen_tradegoodsst, trade_search_fort, 2); IMPLEMENT_HOOKS_WITH_ID(df::viewscreen_tradegoodsst, trade_search_fort, 2, 100);
// //
// END: Trade screen search // END: Trade screen search