Fix some includes

ContentBuildingReader.cpp

@@ -9,8 +9,10 @@
 #include "tinyxml.h"
 #include "GUI.h"
 #include "ContentLoader.h"
-#include "df/world_raws.h"
+
 #include "df/building_def.h"
+#include "df/world.h"
+#include "df/world_raws.h"
 
 int parseConditionNode(ConditionalNode* node, TiXmlElement* elemCondition, bool silent);
 bool parseSpriteNode(SpriteNode* node, TiXmlElement* elemParent);

ContentLoader.cpp

@@ -9,23 +9,23 @@
 #include "tinyxml.h"
 #include "GUI.h"
 
-#include "df/world_raws.h"
+#include "df/caste_raw.h"
+#include "df/creature_raw.h"
+#include "df/entity_position.h"
+#include "df/entity_position_raw.h"
+#include "df/entity_raw.h"
+#include "df/historical_entity.h"
 #include "df/itemdef.h"
-#include "df/itemdef_weaponst.h"
 #include "df/itemdef_armorst.h"
-#include "df/itemdef_shoesst.h"
-#include "df/itemdef_shieldst.h"
-#include "df/itemdef_helmst.h"
 #include "df/itemdef_glovesst.h"
+#include "df/itemdef_helmst.h"
 #include "df/itemdef_pantsst.h"
-
-#include "df/creature_raw.h"
-#include "df/caste_raw.h"
+#include "df/itemdef_shieldst.h"
+#include "df/itemdef_shoesst.h"
+#include "df/itemdef_weaponst.h"
 #include "df/tissue_style_raw.h"
-#include "df/entity_position_raw.h"
-#include "df/entity_raw.h"
-#include "df/historical_entity.h"
-#include "df/entity_position.h"
+#include "df/world.h"
+#include "df/world_raws.h"
 
 #include "ConnectionState.h"
 #include "EnumToString.h"

ContentLoader.h

@@ -10,6 +10,10 @@
 #include "ItemConfiguration.h"
 #include "common.h"
 
+namespace df {
+    struct world_raws;
+}
+
 class ContentLoader
 {
 private:

DumpInfo.cpp

@@ -16,7 +16,6 @@ be intended for use by people not interested in development.
 
 #include "tinyxml.h"
 
-//#include "df/world_raws.h"
 #include "df/itemdef.h"
 #include "df/itemdef_weaponst.h"
 #include "df/itemdef_armorst.h"
@@ -25,6 +24,8 @@ be intended for use by people not interested in development.
 #include "df/itemdef_helmst.h"
 #include "df/itemdef_glovesst.h"
 #include "df/itemdef_pantsst.h"
+#include "df/world.h"
+#include "df/world_raws.h"
 
 //FIXME: filled with black magic
 void dumpSegment()
@@ -266,4 +267,4 @@ void DumpInfo(color_ostream & out, std::vector<std::string> & params)
         out.printerr("invalid argument\n");
     }
 
-}
+}

GUI.cpp

@@ -19,6 +19,7 @@ using namespace std;
 
 #include "df/ui.h"
 #include "df/building_actual.h"
+#include "df/world.h"
 
 #include "df/itemdef.h"
 #include "df/itemdef_weaponst.h"
@@ -45,6 +46,7 @@ using namespace std;
 #include "df/viewscreen_dungeon_wrestlest.h"
 #include "df/ui_advmode.h"
 #include "df/report.h"
+
 #include "allegro5/allegro_color.h"
 extern ALLEGRO_FONT *font;
 

GameBuildings.cpp

@@ -14,6 +14,7 @@
 #include "df/item_slabst.h"
 #include "df/itemimprovement.h"
 #include "df/itemimprovement_threadst.h"
+#include "df/world.h"
 
 using df::global::world;
 

MapLoading.cpp

@@ -9,14 +9,19 @@
 #include "GameBuildings.h"
 #include "Creatures.h"
 #include "ContentLoader.h"
-#include <df/flow_info.h>
-#include <df/plant.h>
-#include <df/flow_info.h>
+
+#include "df/block_square_event_grassst.h"
+#include "df/block_square_event_material_spatterst.h"
+#include "df/block_square_event_mineralst.h"
+#include "df/flow_info.h"
+#include "df/flow_info.h"
 #include "df/item_constructed.h"
+#include "df/item_threadst.h"
 #include "df/itemimprovement.h"
 #include "df/itemimprovement_threadst.h"
-#include "df/item_threadst.h"
+#include "df/map_block.h"
 #include "df/map_block_column.h"
+#include "df/plant.h"
 #include "df/plant_tree_info.h"
 #include "df/plant_tree_tile.h"
 

SpriteObjects.cpp

@@ -1,28 +1,30 @@
+#include <cmath>
+
 #include "common.h"
 #include "SpriteObjects.h"
 #include "GUI.h"
 #include "ContentLoader.h"
 #include "WorldSegment.h"
 #include "SpriteColors.h"
 #include "SpriteMaps.h"
-#include <cmath>
 
-#include "df/world_raws.h"
-#include "df/itemdef_weaponst.h"
-#include "df/itemdef_trapcompst.h"
-#include "df/itemdef_toyst.h"
-#include "df/itemdef_toolst.h"
-#include "df/itemdef_instrumentst.h"
-#include "df/itemdef_armorst.h"
+#include "df/descriptor_pattern.h"
 #include "df/itemdef_ammost.h"
-#include "df/itemdef_siegeammost.h"
-#include "df/itemdef_shoesst.h"
-#include "df/itemdef_shieldst.h"
-#include "df/itemdef_helmst.h"
+#include "df/itemdef_armorst.h"
+#include "df/itemdef_foodst.h"
 #include "df/itemdef_glovesst.h"
+#include "df/itemdef_helmst.h"
+#include "df/itemdef_instrumentst.h"
 #include "df/itemdef_pantsst.h"
-#include "df/itemdef_foodst.h"
-#include "df/descriptor_pattern.h"
+#include "df/itemdef_shieldst.h"
+#include "df/itemdef_shoesst.h"
+#include "df/itemdef_siegeammost.h"
+#include "df/itemdef_toolst.h"
+#include "df/itemdef_toyst.h"
+#include "df/itemdef_trapcompst.h"
+#include "df/itemdef_weaponst.h"
+#include "df/world.h"
+#include "df/world_raws.h"
 
 #define ALL_BORDERS 255
 

Tile.cpp

@@ -10,6 +10,7 @@
 #include "df/building_type.h"
 #include "df/plant_growth.h"
 #include "df/plant_growth_print.h"
+#include "df/world.h"
 
 ALLEGRO_BITMAP *sprite_miasma = 0;
 ALLEGRO_BITMAP *sprite_water = 0;
@@ -843,4 +844,4 @@ RemoteFortressReader::TiletypeSpecial Tile::tileSpecial()
 RemoteFortressReader::TiletypeMaterial Tile::tileMaterial()
 {
     return contentLoader->tiletypeNameList.tiletype_list(tileType).material();
-}
+}

Tile.h

@@ -5,6 +5,8 @@
 #include "TileTypes.h"
 #include "df/item_type.h"
 #include "df/plant_tree_tile.h"
+#include "df/tile_liquid_flow_dir.h"
+#include "df/tile_occupancy.h"
 #include "RemoteFortressReader.pb.h"
 #include <vector>
 
@@ -156,4 +158,4 @@ inline bool IDhasOpaqueFloor(int in)
 inline bool IDhasOpaqueSides(int in)
 {
     return (!FlowPassable( (tiletype::tiletype) in ));
-}
+}