Fix buildingplan stuff on Windows.

DFHack · Jan 6, 2015 · 448404a · 448404a
1 parent 1519d8e
commit 448404a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -93,7 +93,7 @@ if (BUILD_SUPPORTED)
     DFHACK_PLUGIN(autotrade autotrade.cpp)
     DFHACK_PLUGIN(burrows burrows.cpp LINK_LIBRARIES lua)
     DFHACK_PLUGIN(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
-    #DFHACK_PLUGIN(buildingplan buildingplan-lib.cpp buildingplan.cpp)
+    DFHACK_PLUGIN(buildingplan buildingplan-lib.cpp buildingplan.cpp)
     DFHACK_PLUGIN(catsplosion catsplosion.cpp)
     DFHACK_PLUGIN(changeitem changeitem.cpp)
     DFHACK_PLUGIN(changelayer changelayer.cpp)
@@ -122,7 +122,7 @@ if (BUILD_SUPPORTED)
     DFHACK_PLUGIN(flows flows.cpp)
     DFHACK_PLUGIN(follow follow.cpp)
     DFHACK_PLUGIN(forceequip forceequip.cpp)
-    #DFHACK_PLUGIN(fortplan buildingplan-lib.cpp fortplan.cpp)
+    DFHACK_PLUGIN(fortplan buildingplan-lib.cpp fortplan.cpp)
     DFHACK_PLUGIN(getplants getplants.cpp)
     DFHACK_PLUGIN(hotkeys hotkeys.cpp)
     DFHACK_PLUGIN(infiniteSky infiniteSky.cpp)

diff --git a/plugins/buildingplan-lib.cpp b/plugins/buildingplan-lib.cpp
@@ -1,7 +1,7 @@
 #include "buildingplan-lib.h"
 
 #define PLUGIN_VERSION 0.00
-static void debug(const string &msg)
+void debug(const string &msg)
 {
     if (!show_debugging)
         return;
@@ -10,6 +10,8 @@ static void debug(const string &msg)
     out << "DEBUG (" << PLUGIN_VERSION << "): " << msg << endl;
 }
 
+void enable_quickfort_fn(pair<const df::building_type, bool>& pair) { pair.second = true; }
+
 /*
  * Material Choice Screen
  */

diff --git a/plugins/buildingplan-lib.h b/plugins/buildingplan-lib.h
@@ -97,12 +97,12 @@ static MaterialInfo &material_info_identity_fn(MaterialInfo &m);
 
 static map<df::building_type, bool> planmode_enabled, saved_planmodes;
 
-static void enable_quickfort_fn(pair<const df::building_type, bool>& pair);
+void enable_quickfort_fn(pair<const df::building_type, bool>& pair);
 
-static void debug(const std::string &msg);
+void debug(const std::string &msg);
 static std::string material_to_string_fn(MaterialInfo m);
 
-static bool show_debugging = true;
+static bool show_debugging = false;
 static bool show_help = false;
 
 struct ItemFilter

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
@@ -11,7 +11,6 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out )
     return CR_OK;
 }
 
-static void enable_quickfort_fn(pair<const df::building_type, bool>& pair) { pair.second = true; }
 
 static bool is_planmode_enabled(df::building_type type)
 {