summaryrefslogtreecommitdiff
path: root/plugins/colonies.cpp
diff options
context:
space:
mode:
authorQuietust2012-01-15 14:54:14 -0600
committerQuietust2012-01-15 14:54:14 -0600
commite82055986e1d0850915095721175a32656c716c5 (patch)
treeefe8ac66f58ef76b06bec2cf78bafce4e7773fae /plugins/colonies.cpp
parentf3cbf07a0130a1f41c3e14ce320516425604d01f (diff)
downloaddfhack-e82055986e1d0850915095721175a32656c716c5.tar.gz
dfhack-e82055986e1d0850915095721175a32656c716c5.tar.bz2
dfhack-e82055986e1d0850915095721175a32656c716c5.tar.xz
Only use #include <> for system libraries - for everything else, use ""
Diffstat (limited to 'plugins/colonies.cpp')
-rw-r--r--plugins/colonies.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/colonies.cpp b/plugins/colonies.cpp
index 3089b7cc..ba1e16cc 100644
--- a/plugins/colonies.cpp
+++ b/plugins/colonies.cpp
@@ -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;