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

Fix gcc compiler errors and warnings in search, reindent plugin_init, etc.

develop
Alexander Gavrilov 2012-11-03 14:31:07 +04:00
parent 43ab172652
commit 8bccfb1e9a
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
Unescape Escape View File

@ -23,6 +23,9 @@ DFHack future
Together with a couple of binary patches and the gui/assign-rack script, Together with a couple of binary patches and the gui/assign-rack script,
this plugin makes weapon racks, armor stands, chests and cabinets in this plugin makes weapon racks, armor stands, chests and cabinets in
properly designated barracks be used again for storage of squad equipment. properly designated barracks be used again for storage of squad equipment.
New Search plugin by falconne:
Adds an incremental search function to the Stocks, Trading and Unit List screens.
DFHack v0.34.11-r2 DFHack v0.34.11-r2

53
plugins/search.cpp
Unescape Escape View File

@ -206,12 +206,12 @@ protected:
bool list_has_been_sorted = (sort_list1->size() == reference_list.size() bool list_has_been_sorted = (sort_list1->size() == reference_list.size()
&& *sort_list1 != reference_list); && *sort_list1 != reference_list);
for (int i = 0; i < saved_indexes.size(); i++) for (size_t i = 0; i < saved_indexes.size(); i++)
{ {
int adjusted_item_index = i; int adjusted_item_index = i;
if (list_has_been_sorted) if (list_has_been_sorted)
{ {
for (int j = 0; j < sort_list1->size(); j++) for (size_t j = 0; j < sort_list1->size(); j++)
{ {
if ((*sort_list1)[j] == reference_list[i]) if ((*sort_list1)[j] == reference_list[i])
{ {
@ -278,7 +278,7 @@ protected:
} }
string search_string_l = toLower(search_string); string search_string_l = toLower(search_string);
for (int i = 0; i < saved_list1.size(); i++ ) for (size_t i = 0; i < saved_list1.size(); i++ )
{ {
T element = saved_list1[i]; T element = saved_list1[i];
string desc = toLower(get_element_description(element)); string desc = toLower(get_element_description(element));
@ -440,8 +440,8 @@ private:
typedef search_hook<df::viewscreen_storesst, stocks_search> stocks_search_hook; typedef search_hook<df::viewscreen_storesst, stocks_search> stocks_search_hook;
IMPLEMENT_VMETHOD_INTERPOSE(stocks_search_hook, feed); template<> IMPLEMENT_VMETHOD_INTERPOSE(stocks_search_hook, feed);
IMPLEMENT_VMETHOD_INTERPOSE(stocks_search_hook, render); template<> IMPLEMENT_VMETHOD_INTERPOSE(stocks_search_hook, render);
// //
// END: Stocks screen search // END: Stocks screen search
@ -502,8 +502,8 @@ 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_PRIO(unitlist_search_hook, feed, 100); template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(unitlist_search_hook, feed, 100);
IMPLEMENT_VMETHOD_INTERPOSE_PRIO(unitlist_search_hook, render, 100); template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(unitlist_search_hook, render, 100);
// //
// END: Unit screen search // END: Unit screen search
@ -552,8 +552,8 @@ public:
}; };
typedef search_hook<df::viewscreen_tradegoodsst, trade_search_merc, int> trade_search_merc_hook; typedef search_hook<df::viewscreen_tradegoodsst, trade_search_merc, int> trade_search_merc_hook;
IMPLEMENT_VMETHOD_INTERPOSE(trade_search_merc_hook, feed); template<> IMPLEMENT_VMETHOD_INTERPOSE(trade_search_merc_hook, feed);
IMPLEMENT_VMETHOD_INTERPOSE(trade_search_merc_hook, render); template<> IMPLEMENT_VMETHOD_INTERPOSE(trade_search_merc_hook, render);
class trade_search_fort : public trade_search_base class trade_search_fort : public trade_search_base
@ -576,8 +576,8 @@ public:
}; };
typedef search_hook<df::viewscreen_tradegoodsst, trade_search_fort, char> trade_search_fort_hook; typedef search_hook<df::viewscreen_tradegoodsst, trade_search_fort, char> trade_search_fort_hook;
IMPLEMENT_VMETHOD_INTERPOSE(trade_search_fort_hook, feed); template<> IMPLEMENT_VMETHOD_INTERPOSE(trade_search_fort_hook, feed);
IMPLEMENT_VMETHOD_INTERPOSE(trade_search_fort_hook, render); template<> IMPLEMENT_VMETHOD_INTERPOSE(trade_search_fort_hook, render);
// //
// END: Trade screen search // END: Trade screen search
@ -589,10 +589,15 @@ DFHACK_PLUGIN("search");
DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands) DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
{ {
if (!gps || !INTERPOSE_HOOK(unitlist_search_hook, feed).apply() || !INTERPOSE_HOOK(unitlist_search_hook, render).apply() if (!gps ||
|| !INTERPOSE_HOOK(trade_search_merc_hook, feed).apply() || !INTERPOSE_HOOK(trade_search_merc_hook, render).apply() !INTERPOSE_HOOK(unitlist_search_hook, feed).apply() ||
|| !INTERPOSE_HOOK(trade_search_fort_hook, feed).apply() || !INTERPOSE_HOOK(trade_search_fort_hook, render).apply() !INTERPOSE_HOOK(unitlist_search_hook, render).apply() ||
|| !INTERPOSE_HOOK(stocks_search_hook, feed).apply() || !INTERPOSE_HOOK(stocks_search_hook, render).apply()) !INTERPOSE_HOOK(trade_search_merc_hook, feed).apply() ||
!INTERPOSE_HOOK(trade_search_merc_hook, render).apply() ||
!INTERPOSE_HOOK(trade_search_fort_hook, feed).apply() ||
!INTERPOSE_HOOK(trade_search_fort_hook, render).apply() ||
!INTERPOSE_HOOK(stocks_search_hook, feed).apply() ||
!INTERPOSE_HOOK(stocks_search_hook, render).apply())
out.printerr("Could not insert Search hooks!\n"); out.printerr("Could not insert Search hooks!\n");
return CR_OK; return CR_OK;
@ -613,9 +618,17 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out )
DFhackCExport command_result plugin_onstatechange ( color_ostream &out, state_change_event event ) DFhackCExport command_result plugin_onstatechange ( color_ostream &out, state_change_event event )
{ {
unitlist_search_hook::module.reset_all(); switch (event) {
trade_search_merc_hook::module.reset_all(); case SC_VIEWSCREEN_CHANGED:
trade_search_fort_hook::module.reset_all(); unitlist_search_hook::module.reset_all();
stocks_search_hook::module.reset_all(); trade_search_merc_hook::module.reset_all();
trade_search_fort_hook::module.reset_all();
stocks_search_hook::module.reset_all();
break;
default:
break;
}
return CR_OK; return CR_OK;
} }