|
|
@ -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; \
|
|
|
@ -1074,7 +1074,7 @@ class trade_search_merc : public trade_search_base
|
|
|
|
public:
|
|
|
|
public:
|
|
|
|
virtual void render() const
|
|
|
|
virtual void render() const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
print_search_option(2, 26);
|
|
|
|
print_search_option(2, -1);
|
|
|
|
|
|
|
|
|
|
|
|
if (!search_string.empty())
|
|
|
|
if (!search_string.empty())
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -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
|
|
|
@ -1116,7 +1116,7 @@ class trade_search_fort : public trade_search_base
|
|
|
|
public:
|
|
|
|
public:
|
|
|
|
virtual void render() const
|
|
|
|
virtual void render() const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
print_search_option(42, 26);
|
|
|
|
print_search_option(42, -1);
|
|
|
|
|
|
|
|
|
|
|
|
if (!search_string.empty())
|
|
|
|
if (!search_string.empty())
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -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
|
|
|
|