ditch the unused Vegetation module

Atkana · Dec 6, 2012 · ebc2625 · ebc2625
1 parent 885059c
commit ebc2625
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 120 deletions.
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -121,7 +121,6 @@ include/modules/Materials.h
 include/modules/Notes.h
 include/modules/Screen.h
 include/modules/Translation.h
-include/modules/Vegetation.h
 include/modules/Vermin.h
 include/modules/World.h
 include/modules/Graphic.h
@@ -142,7 +141,6 @@ modules/Materials.cpp
 modules/Notes.cpp
 modules/Screen.cpp
 modules/Translation.cpp
-modules/Vegetation.cpp
 modules/Vermin.cpp
 modules/World.cpp
 modules/Graphic.cpp

diff --git a/library/include/DFHack.h b/library/include/DFHack.h
@@ -61,7 +61,6 @@ distribution.
 #include "modules/Translation.h"
 #include "modules/World.h"
 #include "modules/Items.h"
-#include "modules/Vegetation.h"
 #include "modules/Maps.h"
 #include "modules/Gui.h"
 

diff --git a/library/include/ModuleFactory.h b/library/include/ModuleFactory.h
@@ -33,7 +33,6 @@ namespace DFHack
     Module* createGui();
     Module* createWorld();
     Module* createMaterials();
-    Module* createVegetation();
     Module* createNotes();
     Module* createGraphic();
 }

diff --git a/library/include/modules/Maps.h b/library/include/modules/Maps.h
@@ -32,7 +32,6 @@ distribution.
 
 #include "Export.h"
 #include "Module.h"
-#include "modules/Vegetation.h"
 #include <vector>
 #include "BitArray.h"
 #include "modules/Materials.h"

diff --git a/library/include/modules/Vegetation.h b/library/include/modules/Vegetation.h
diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp
@@ -59,6 +59,7 @@ using namespace std;
 #include "df/z_level_flags.h"
 #include "df/region_map_entry.h"
 #include "df/flow_info.h"
+#include "df/plant.h"
 
 using namespace DFHack;
 using namespace df::enums;

diff --git a/library/modules/Vegetation.cpp b/library/modules/Vegetation.cpp
diff --git a/plugins/cleaners.cpp b/plugins/cleaners.cpp
@@ -12,6 +12,7 @@
 #include "df/global_objects.h"
 #include "df/builtin_mats.h"
 #include "df/contaminant.h"
+#include "df/plant.h"
 
 using std::vector;
 using std::string;

diff --git a/plugins/devel/tiles.cpp b/plugins/devel/tiles.cpp
@@ -11,7 +11,6 @@ using std::string;
 #include <Console.h>
 #include <Export.h>
 #include <PluginManager.h>
-#include <modules/Vegetation.h>
 #include <modules/Maps.h>
 #include <modules/Gui.h>
 #include <TileTypes.h>

diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
@@ -11,8 +11,8 @@
 #include "df/map_block.h"
 #include "df/tile_dig_designation.h"
 #include "df/plant_raw.h"
+#include "df/plant.h"
 
-#include "modules/Vegetation.h"
 #include <set>
 
 using std::string;

diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp
@@ -37,7 +37,6 @@ using std::set;
 #include "Console.h"
 #include "Export.h"
 #include "PluginManager.h"
-#include "modules/Vegetation.h"
 #include "modules/Maps.h"
 #include "modules/Gui.h"
 #include "TileTypes.h"

diff --git a/plugins/mapexport/mapexport.cpp b/plugins/mapexport/mapexport.cpp
@@ -13,6 +13,7 @@ using namespace google::protobuf::io;
 
 #include "DataDefs.h"
 #include "df/world.h"
+#include "df/plant.h"
 #include "modules/Constructions.h"
 
 #include "proto/Map.pb.h"

diff --git a/plugins/plants.cpp b/plugins/plants.cpp
@@ -9,17 +9,19 @@
 #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 "df/plant.h"
 
 using std::vector;
 using std::string;
 using namespace DFHack;
 using df::global::world;
 
+const uint32_t sapling_to_tree_threshold = 120 * 28 * 12 * 3; // 3 years
+
 command_result df_grow (color_ostream &out, vector <string> & parameters);
 command_result df_immolate (color_ostream &out, vector <string> & parameters);
 command_result df_extirpate (color_ostream &out, vector <string> & parameters);
@@ -219,7 +221,7 @@ command_result df_grow (color_ostream &out, vector <string> & parameters)
                     if(tileShape(map.tiletypeAt(DFCoord(x,y,z))) == tiletype_shape::SAPLING &&
                         tileSpecial(map.tiletypeAt(DFCoord(x,y,z))) != tiletype_special::DEAD)
                     {
-                        tree->grow_counter = Vegetation::sapling_to_tree_threshold;
+                        tree->grow_counter = sapling_to_tree_threshold;
                     }
                     break;
                 }
@@ -235,7 +237,7 @@ command_result df_grow (color_ostream &out, vector <string> & parameters)
             df::tiletype ttype = map.tiletypeAt(df::coord(p->pos.x,p->pos.y,p->pos.z));
             if(!p->flags.bits.is_shrub && tileShape(ttype) == tiletype_shape::SAPLING && tileSpecial(ttype) != tiletype_special::DEAD)
             {
-                p->grow_counter = Vegetation::sapling_to_tree_threshold;
+                p->grow_counter = sapling_to_tree_threshold;
             }
         }
     }

diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp
@@ -33,6 +33,7 @@ using namespace std;
 #include "df/region_map_entry.h"
 #include "df/inclusion_type.h"
 #include "df/viewscreen_choose_start_sitest.h"
+#include "df/plant.h"
 
 using namespace DFHack;
 using namespace df::enums;

diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
@@ -34,7 +34,6 @@ using std::set;
 #include "Console.h"
 #include "Export.h"
 #include "PluginManager.h"
-#include "modules/Vegetation.h"
 #include "modules/Maps.h"
 #include "modules/Gui.h"
 #include "TileTypes.h"