Clean up includes in the "classes" folder

- Canonicalized the header guards
- Removed all the sneaky dependencies between files
- Made sure includes were properly sorted

osx/classes.h

@@ -8,6 +8,8 @@
  *
  */
 
+// TODO: Delete this file, and move the function defined here to a more appropriate place.
+
 #include "simpletypes.h"
 #include "location.h"
 #include "terrain.h"

osx/classes/creatlist.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/creatlist.h

@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef CREATLIST_H
-#define CREATLIST_H
+#ifndef BOE_DATA_CREATLIST_H
+#define BOE_DATA_CREATLIST_H
 
 #include "monster.h"
 

osx/classes/item.cpp

@@ -11,9 +11,8 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
-#include "boe.consts.h"
+#include "boe.consts.h" // TODO: If this is needed here, maybe it shouldn't be in the "boe" namespace
 #include "oldstructs.h"
 
 cItemRec k;

osx/classes/item.h

@@ -6,12 +6,13 @@
  *
  */
 
-#ifndef ITEM_H
-#define ITEM_H
+#ifndef BOE_DATA_ITEM_H
+#define BOE_DATA_ITEM_H
 
-#include "location.h"
 #include <string>
 #include <iosfwd>
+
+#include "location.h"
 #include "simpletypes.h"
 
 namespace legacy { struct item_record_type; };

osx/classes/location.h

@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef LOCATION_H
-#define LOCATION_H
+#ifndef BOE_LOCATION_H
+#define BOE_LOCATION_H
 
 #include <SFML/Graphics.hpp>
 

osx/classes/monster.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/monster.h

@@ -6,11 +6,12 @@
  *
  */
 
-#ifndef MONSTER_H
-#define MONSTER_H
+#ifndef BOE_DATA_MONSTER_H
+#define BOE_DATA_MONSTER_H
 
 #include <string>
 #include <iosfwd>
+
 #include "soundtool.h"
 #include "simpletypes.h"
 #include "graphtool.h"

osx/classes/outdoors.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/outdoors.h

@@ -6,13 +6,16 @@
  *
  */
 
-#ifndef OUTDOORS_H
-#define OUTDOORS_H
+#ifndef BOE_DATA_OUTDOORS_H
+#define BOE_DATA_OUTDOORS_H
 
-#include "location.h"
 #include <string>
 #include <iosfwd>
+
+#include "location.h"
 #include "special.h"
+#include "simpletypes.h"
+#include "monster.h"
 
 namespace legacy {
 	struct out_wandering_type;

osx/classes/party.h

@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef PARTY_H
-#define PARTY_H
+#ifndef BOE_DATA_PARTY_H
+#define BOE_DATA_PARTY_H
 
 #include <string>
 #include <vector>

osx/classes/pc.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/pc.h

@@ -6,15 +6,19 @@
  *
  */
 
-#ifndef PC_H
-#define PC_H
+#ifndef BOE_DATA_PC_H
+#define BOE_DATA_PC_H
 
 #include <string>
 #include <iosfwd>
+
 #include "simpletypes.h"
+#include "item.h"
 
 namespace legacy { struct pc_record_type; };
 
+typedef unsigned short pic_num_t; // TODO: This is now defined in multiple places...
+
 class cPlayer {
 public:
 	eMainStatus main_status;

osx/classes/regtown.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/regtown.h

@@ -6,11 +6,16 @@
  *
  */
 
-#ifndef REGTOWN_H
-#define REGTOWN_H
+#ifndef BOE_DATA_REGTOWN_H
+#define BOE_DATA_REGTOWN_H
 
 #include <iosfwd>
 
+#include "town.h"
+#include "simpletypes.h"
+#include "location.h"
+#include "monster.h"
+
 namespace legacy {
 	struct big_tr_type;
 	struct ave_tr_type;

osx/classes/scenario.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/scenario.h

@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef SCENARIO_H
-#define SCENARIO_H
+#ifndef BOE_DATA_SCENARIO_H
+#define BOE_DATA_SCENARIO_H
 
 #include <iosfwd>
 #include <boost/filesystem/path.hpp>

osx/classes/simpletypes.h

@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef SIMPLE_TYPES_H
-#define SIMPLE_TYPES_H
+#ifndef BOE_DATA_SIMPLETYPES_H
+#define BOE_DATA_SIMPLETYPES_H
 
 typedef unsigned short m_num_t;
 typedef unsigned short ter_num_t;

osx/classes/special.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/special.h

@@ -6,10 +6,12 @@
  *
  */
 
-#ifndef SPECIAL_H
-#define SPECIAL_H
+#ifndef BOE_DATA_SPECIAL_H
+#define BOE_DATA_SPECIAL_H
 
 #include <iosfwd>
+#include "simpletypes.h"
+#include "location.h"
 
 namespace legacy { struct special_node_type; };
 

osx/classes/talking.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/talking.h

@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef TALKING_H
-#define TALKING_H
+#ifndef BOE_DATA_TALKING_H
+#define BOE_DATA_TALKING_H
 
 #include <iosfwd>
 

osx/classes/terrain.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 #include "boe.consts.h" // TODO: Put these constants in a global file

osx/classes/terrain.h

@@ -6,11 +6,13 @@
  *
  */
 
-#ifndef TERRAIN_H
-#define TERRAIN_H
+#ifndef BOE_DATA_TERRAIN_H
+#define BOE_DATA_TERRAIN_H
 
 #include <string>
 #include <iosfwd>
+
+#include "simpletypes.h"
 #include "graphtool.h" // for pic_num_t
 
 namespace legacy { struct terrain_type_type; };

osx/classes/tmpltown.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 
 ter_num_t& cBigTemplTown::terrain(size_t x, size_t y){

osx/classes/tmpltown.h

@@ -6,11 +6,16 @@
  *
  */
 
-#ifndef TMPLTOWN_H
-#define TMPLTOWN_H
+#ifndef BOE_DATA_TMPLTOWN_H
+#define BOE_DATA_TMPLTOWN_H
 
 #include <iosfwd>
 
+#include "location.h"
+#include "monster.h"
+#include "simpletypes.h"
+#include "regtown.h"
+
 class cTemplTown {
 public:
 	class cCityBlock { // formerly city_block_type

osx/classes/town.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/town.h

@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef TOWN_H
-#define TOWN_H
+#ifndef BOE_DATA_TOWN_H
+#define BOE_DATA_TOWN_H
 
 #include <vector>
 #include <iosfwd>

osx/classes/universe.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 #include "mathutil.h"

osx/classes/universe.h

@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef UNIVERSE_H
-#define UNIVERSE_H
+#ifndef BOE_DATA_UNIVERSE_H
+#define BOE_DATA_UNIVERSE_H
 
 #include <iosfwd>
 #include <boost/filesystem/path.hpp>

osx/classes/vehicle.cpp

@@ -11,7 +11,6 @@
 #include <map>
 #include <sstream>
 
-
 #include "classes.h"
 #include "oldstructs.h"
 

osx/classes/vehicle.h

@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef VEHICLE_H
-#define VEHICLE_H
+#ifndef BOE_DATA_VEHICLE_H
+#define BOE_DATA_VEHICLE_H
 
 #include <iosfwd>
 #include "location.h"