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

Only use #include <> for system libraries - for everything else, use ""

develop
Quietust 2012-01-15 14:54:14 -06:00
parent f3cbf07a01
commit e82055986e
30 changed files with 252 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/modules/Job.cpp
Unescape Escape View File

@ -1,4 +1,4 @@
/*
/*
https://github.com/peterix/dfhack
Copyright (c) 2009-2011 Petr Mrázek (peterix@gmail.com)
@ -40,14 +40,14 @@ using namespace std;
#include "modules/Items.h"
#include "DataDefs.h"
#include <df/world.h>
#include <df/ui.h>
#include <df/job.h>
#include <df/job_item.h>
#include <df/job_list_link.h>
#include <df/general_ref.h>
#include <df/general_ref_unit_workerst.h>
#include <df/general_ref_building_holderst.h>
#include "df/world.h"
#include "df/ui.h"
#include "df/job.h"
#include "df/job_item.h"
#include "df/job_list_link.h"
#include "df/general_ref.h"
#include "df/general_ref_unit_workerst.h"
#include "df/general_ref_building_holderst.h"
using namespace DFHack;
using namespace df::enums;

32
plugins/autodump.cpp
Unescape Escape View File

@ -5,27 +5,25 @@
#include <sstream>
#include <climits>
#include <vector>
#include <string>
#include <algorithm>
#include <set>
using namespace std;
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <vector>
#include <string>
#include <algorithm>
#include <modules/Maps.h>
#include <modules/Gui.h>
#include <modules/Items.h>
#include <modules/Materials.h>
#include <modules/MapCache.h>
#include <DataDefs.h>
#include <df/item.h>
#include <df/world.h>
#include <df/general_ref_unit_holderst.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Maps.h"
#include "modules/Gui.h"
#include "modules/Items.h"
#include "modules/Materials.h"
#include "modules/MapCache.h"
#include "DataDefs.h"
#include "df/item.h"
#include "df/world.h"
#include "df/general_ref.h"
using namespace DFHack;
using MapExtras::Block;

8
plugins/cleaners.cpp
Unescape Escape View File

@ -1,7 +1,7 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "DataDefs.h"
#include "df/world.h"
@ -227,4 +227,4 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector <PluginCommand>
DFhackCExport command_result plugin_shutdown ( Core * c )
{
return CR_OK;
}
}

16
plugins/cleanowned.cpp
Unescape Escape View File

@ -9,16 +9,16 @@
using namespace std;
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <vector>
#include <string>
#include <modules/Maps.h>
#include <modules/Items.h>
#include <modules/Units.h>
#include <modules/Materials.h>
#include <modules/Translation.h>
#include "modules/Maps.h"
#include "modules/Items.h"
#include "modules/Units.h"
#include "modules/Materials.h"
#include "modules/Translation.h"
using namespace DFHack;
DFhackCExport command_result df_cleanowned (Core * c, vector <string> & parameters);

18
plugins/colonies.cpp
Unescape Escape View File

@ -1,16 +1,16 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <vector>
#include <string>
#include <modules/Vermin.h>
#include "modules/Vermin.h"
#include "modules/Materials.h"
using std::vector;
using std::string;
using namespace DFHack;
using namespace DFHack::Simple;
#include <DFHack.h>
DFhackCExport command_result colonies (Core * c, vector <string> & parameters);
@ -34,8 +34,8 @@ DFhackCExport command_result plugin_shutdown ( Core * c )
}
void destroyColonies();
void convertColonies(DFHack::Materials *Materials);
void showColonies(Core *c, DFHack::Materials *Materials);
void convertColonies(Materials *Materials);
void showColonies(Core *c, Materials *Materials);
DFhackCExport command_result colonies (Core * c, vector <string> & parameters)
{
@ -106,7 +106,7 @@ void destroyColonies()
}
// Convert all colonies to honey bees.
void convertColonies(DFHack::Materials *Materials)
void convertColonies(Materials *Materials)
{
int bee_idx = -1;
for (size_t i = 0; i < Materials->raceEx.size(); i++)
@ -136,7 +136,7 @@ void convertColonies(DFHack::Materials *Materials)
}
}
void showColonies(Core *c, DFHack::Materials *Materials)
void showColonies(Core *c, Materials *Materials)
{
uint32_t numSpawnPoints = Vermin::getNumVermin();
int numColonies = 0;

10
plugins/deramp.cpp
Unescape Escape View File

@ -1,15 +1,15 @@
// De-ramp. All ramps marked for removal are replaced with given tile (presently, normal floor).
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "DataDefs.h"
#include "df/world.h"
#include "df/map_block.h"
#include "df/tile_dig_designation.h"
#include <TileTypes.h>
#include "TileTypes.h"
using std::vector;
using std::string;
@ -111,4 +111,4 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector <PluginCommand>
DFhackCExport command_result plugin_shutdown ( Core * c )
{
return CR_OK;
}
}

10
plugins/drybuckets.cpp
Unescape Escape View File

@ -1,11 +1,11 @@
// Dry Buckets : Remove all "water" objects from buckets scattered around the fortress
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <DataDefs.h>
#include "DataDefs.h"
#include "df/world.h"
#include "df/item.h"
#include "df/builtin_mats.h"
@ -53,4 +53,4 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector <PluginCommand>
DFhackCExport command_result plugin_shutdown ( Core * c )
{
return CR_OK;
}
}

8
plugins/fastdwarf.cpp
Unescape Escape View File

@ -1,9 +1,9 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <DataDefs.h>
#include "DataDefs.h"
#include "df/ui.h"
#include "df/world.h"
#include "df/unit.h"

14
plugins/filltraffic.cpp
Unescape Escape View File

@ -6,12 +6,12 @@
#include <map>
#include <vector>
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <modules/Maps.h>
#include <modules/MapCache.h>
#include <modules/Gui.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Maps.h"
#include "modules/MapCache.h"
#include "modules/Gui.h"
using std::stack;
using MapExtras::MapCache;
using namespace DFHack;
@ -377,4 +377,4 @@ void allRestricted(DFHack::DFCoord coord, MapExtras::MapCache * map)
DFHack::t_designation des = map->designationAt(coord);
des.bits.traffic = traffic_restricted;
map->setDesignationAt(coord, des);
}
}

10
plugins/fixwagons.cpp
Unescape Escape View File

@ -1,11 +1,11 @@
// I'll fix his little red wagon...
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <DataDefs.h>
#include "DataDefs.h"
#include "df/world.h"
#include "df/historical_entity.h"
#include "df/entity_raw.h"
@ -103,4 +103,4 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector <PluginCommand>
DFhackCExport command_result plugin_shutdown ( Core * c )
{
return CR_OK;
}
}

8
plugins/flows.cpp
Unescape Escape View File

@ -1,11 +1,11 @@
// This tool counts static tiles and active flows of water and magma.
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <DataDefs.h>
#include "DataDefs.h"
#include "df/world.h"
#include "df/map_block.h"
#include "df/tile_liquid.h"

12
plugins/getplants.cpp
Unescape Escape View File

@ -1,12 +1,12 @@
// Designate all matching plants for gathering/cutting
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <DataDefs.h>
#include <TileTypes.h>
#include "DataDefs.h"
#include "TileTypes.h"
#include "df/world.h"
#include "df/map_block.h"
#include "df/tile_dig_designation.h"
@ -152,4 +152,4 @@ DFhackCExport command_result plugin_init ( Core * c, vector <PluginCommand> &com
DFhackCExport command_result plugin_shutdown ( Core * c )
{
return CR_OK;
}
}

10
plugins/initflags.cpp
Unescape Escape View File

@ -1,10 +1,10 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <DataDefs.h>
#include <df/d_init.h>
#include "DataDefs.h"
#include "df/d_init.h"
using std::vector;
using std::string;

51
plugins/jobutils.cpp
Unescape Escape View File

@ -1,30 +1,29 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <MiscUtils.h>
#include <modules/Materials.h>
#include <modules/Items.h>
#include <modules/Gui.h>
#include <modules/Job.h>
#include <DataDefs.h>
#include <df/world.h>
#include <df/ui.h>
#include <df/ui_build_selector.h>
#include <df/ui_build_item_req.h>
#include <df/build_req_choice_genst.h>
#include <df/build_req_choice_specst.h>
#include <df/building_workshopst.h>
#include <df/building_furnacest.h>
#include <df/job.h>
#include <df/job_item.h>
#include <df/job_list_link.h>
#include <df/item.h>
#include <df/tool_uses.h>
#include <df/general_ref.h>
#include <df/general_ref_unit_workerst.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "MiscUtils.h"
#include "modules/Materials.h"
#include "modules/Items.h"
#include "modules/Gui.h"
#include "modules/Job.h"
#include "DataDefs.h"
#include "df/world.h"
#include "df/ui.h"
#include "df/ui_build_selector.h"
#include "df/ui_build_item_req.h"
#include "df/build_req_choice_genst.h"
#include "df/build_req_choice_specst.h"
#include "df/building_workshopst.h"
#include "df/building_furnacest.h"
#include "df/job.h"
#include "df/job_item.h"
#include "df/job_list_link.h"
#include "df/item.h"
#include "df/tool_uses.h"
#include "df/general_ref.h"
using std::vector;
using std::string;

16
plugins/liquids.cpp
Unescape Escape View File

@ -10,14 +10,14 @@ using std::endl;
using std::set;
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <modules/Vegetation.h>
#include <modules/Maps.h>
#include <modules/Gui.h>
#include <TileTypes.h>
#include <modules/MapCache.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Vegetation.h"
#include "modules/Maps.h"
#include "modules/Gui.h"
#include "TileTypes.h"
#include "modules/MapCache.h"
using namespace MapExtras;
using namespace DFHack;

10
plugins/mode.cpp
Unescape Escape View File

@ -2,12 +2,12 @@
using namespace std;
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <vector>
#include <string>
#include <modules/World.h>
#include "modules/World.h"
#include <stdlib.h>
using namespace DFHack;
@ -169,4 +169,4 @@ DFhackCExport command_result mode (Core * c, vector <string> & parameters)
c->con << endl;
}
return CR_OK;
}
}

16
plugins/plants.cpp
Unescape Escape View File

@ -6,14 +6,14 @@
#include <string>
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <modules/Vegetation.h>
#include <modules/Maps.h>
#include <modules/Gui.h>
#include <TileTypes.h>
#include <modules/MapCache.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Vegetation.h"
#include "modules/Maps.h"
#include "modules/Gui.h"
#include "TileTypes.h"
#include "modules/MapCache.h"
using std::vector;
using std::string;

21
plugins/probe.cpp
Unescape Escape View File

@ -4,23 +4,22 @@
#include <iomanip>
#include <climits>
#include <vector>
#include <string>
#include <sstream>
#include <ctime>
#include <cstdio>
using namespace std;
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <vector>
#include <string>
#include <modules/Units.h>
#include <modules/Maps.h>
#include <modules/Gui.h>
#include <modules/Materials.h>
#include <modules/MapCache.h>
#include <MiscUtils.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Units.h"
#include "modules/Maps.h"
#include "modules/Gui.h"
#include "modules/Materials.h"
#include "modules/MapCache.h"
#include "MiscUtils.h"
using std::vector;
using std::string;

8
plugins/prospector.cpp
Unescape Escape View File

@ -13,11 +13,11 @@
#include <vector>
using namespace std;
#include <DFHack.h>
#include <modules/MapCache.h>
#include "Core.h"
#include <Console.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/MapCache.h"
using namespace DFHack;

10
plugins/regrass.cpp
Unescape Escape View File

@ -2,14 +2,14 @@
// Necessary for worlds generated prior to version 0.31.19 - otherwise, outdoor shrubs and trees no longer grow.
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <DataDefs.h>
#include "DataDefs.h"
#include "df/world.h"
#include "df/map_block.h"
#include <TileTypes.h>
#include "TileTypes.h"
using std::string;
using std::vector;

28
plugins/rename.cpp
Unescape Escape View File

@ -1,18 +1,18 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <modules/Gui.h>
#include <DataDefs.h>
#include <df/ui.h>
#include <df/world.h>
#include <df/squad.h>
#include <df/unit.h>
#include <df/unit_soul.h>
#include <df/historical_figure.h>
#include <df/language_name.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Gui.h"
#include "DataDefs.h"
#include "df/ui.h"
#include "df/world.h"
#include "df/squad.h"
#include "df/unit.h"
#include "df/unit_soul.h"
#include "df/historical_figure.h"
#include "df/language_name.h"
#include <stdlib.h>

16
plugins/reveal.cpp
Unescape Escape View File

@ -3,13 +3,13 @@
#include <map>
#include <vector>
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <modules/Maps.h>
#include <modules/World.h>
#include <modules/MapCache.h>
#include <modules/Gui.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Maps.h"
#include "modules/World.h"
#include "modules/MapCache.h"
#include "modules/Gui.h"
using MapExtras::MapCache;
using namespace DFHack;
@ -504,4 +504,4 @@ DFhackCExport command_result revflood(DFHack::Core * c, std::vector<std::string>
delete MCache;
c->Resume();
return CR_OK;
}
}

2
plugins/seedwatch.cpp
Unescape Escape View File

@ -12,7 +12,7 @@
#include "modules/Items.h"
#include "modules/World.h"
#include "modules/kitchen.h"
#include <VersionInfo.h>
#include "VersionInfo.h"
using DFHack::t_materialType;
using DFHack::t_materialIndex;

20
plugins/stockpiles.cpp
Unescape Escape View File

@ -1,14 +1,14 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <DataDefs.h>
#include <df/world.h>
#include <df/ui.h>
#include <df/building_stockpilest.h>
#include <df/selection_rect.h>
#include <df/viewscreen_dwarfmodest.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "DataDefs.h"
#include "df/world.h"
#include "df/ui.h"
#include "df/building_stockpilest.h"
#include "df/selection_rect.h"
#include "df/viewscreen_dwarfmodest.h"
using std::vector;
using std::string;

16
plugins/tiletypes.cpp
Unescape Escape View File

@ -11,14 +11,14 @@ using std::endl;
using std::set;
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <modules/Vegetation.h>
#include <modules/Maps.h>
#include <modules/Gui.h>
#include <TileTypes.h>
#include <modules/MapCache.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Vegetation.h"
#include "modules/Maps.h"
#include "modules/Gui.h"
#include "TileTypes.h"
#include "modules/MapCache.h"
using namespace MapExtras;
using namespace DFHack;

14
plugins/tubefill.cpp
Unescape Escape View File

@ -5,13 +5,13 @@
#include <map>
#include <vector>
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <modules/Maps.h>
#include <modules/World.h>
#include <modules/MapCache.h>
#include <modules/Gui.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Maps.h"
#include "modules/World.h"
#include "modules/MapCache.h"
#include "modules/Gui.h"
using MapExtras::MapCache;
using namespace DFHack;

12
plugins/vdig.cpp
Unescape Escape View File

@ -1,10 +1,10 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <modules/Maps.h>
#include <modules/Gui.h>
#include <modules/MapCache.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Maps.h"
#include "modules/Gui.h"
#include "modules/MapCache.h"
#include <vector>
#include <cstdio>
#include <stack>

12
plugins/versionosd.cpp
Unescape Escape View File

@ -8,11 +8,11 @@
#include <string.h>
using namespace std;
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <modules/Graphic.h>
#include <modules/Gui.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "modules/Graphic.h"
#include "modules/Gui.h"
using namespace DFHack;
DFhackCExport command_result df_versionosd (Core * c, vector <string> & parameters);
@ -145,4 +145,4 @@ DFTileSurface* gettile (int x, int y)
}
return NULL;
}
}

8
plugins/weather.cpp
Unescape Escape View File

@ -1,10 +1,10 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include <vector>
#include <string>
#include <modules/World.h>
#include "modules/World.h"
using std::vector;
using std::string;

74
plugins/workflow.cpp
Unescape Escape View File

@ -1,41 +1,41 @@
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
#include <MiscUtils.h>
#include <modules/Materials.h>
#include <modules/Items.h>
#include <modules/Gui.h>
#include <modules/Job.h>
#include <modules/World.h>
#include <DataDefs.h>
#include <df/world.h>
#include <df/ui.h>
#include <df/building_workshopst.h>
#include <df/building_furnacest.h>
#include <df/job.h>
#include <df/job_item.h>
#include <df/job_list_link.h>
#include <df/dfhack_material_category.h>
#include <df/item.h>
#include <df/items_other_id.h>
#include <df/tool_uses.h>
#include <df/general_ref.h>
#include <df/general_ref_unit_workerst.h>
#include <df/general_ref_unit_holderst.h>
#include <df/general_ref_building_holderst.h>
#include <df/general_ref_contains_itemst.h>
#include <df/general_ref_contained_in_itemst.h>
#include <df/general_ref_contains_unitst.h>
#include <df/itemdef_foodst.h>
#include <df/reaction.h>
#include <df/reaction_reagent_itemst.h>
#include <df/reaction_product_itemst.h>
#include <df/plant_raw.h>
#include <df/inorganic_raw.h>
#include <df/builtin_mats.h>
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "MiscUtils.h"
#include "modules/Materials.h"
#include "modules/Items.h"
#include "modules/Gui.h"
#include "modules/Job.h"
#include "modules/World.h"
#include "DataDefs.h"
#include "df/world.h"
#include "df/ui.h"
#include "df/building_workshopst.h"
#include "df/building_furnacest.h"
#include "df/job.h"
#include "df/job_item.h"
#include "df/job_list_link.h"
#include "df/dfhack_material_category.h"
#include "df/item.h"
#include "df/items_other_id.h"
#include "df/tool_uses.h"
#include "df/general_ref.h"
#include "df/general_ref_unit_workerst.h"
#include "df/general_ref_unit_holderst.h"
#include "df/general_ref_building_holderst.h"
#include "df/general_ref_contains_itemst.h"
#include "df/general_ref_contained_in_itemst.h"
#include "df/general_ref_contains_unitst.h"
#include "df/itemdef_foodst.h"
#include "df/reaction.h"
#include "df/reaction_reagent_itemst.h"
#include "df/reaction_product_itemst.h"
#include "df/plant_raw.h"
#include "df/inorganic_raw.h"
#include "df/builtin_mats.h"
using std::vector;
using std::string;