Cleanup:

- removed commented-out #includ'es
- renamed some files to match name of class

lib/mapObjects/CArmedInstance.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CArmedInstance.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -9,7 +9,7 @@
  */
 
 #include "StdInc.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../CTownHandler.h"
 #include "../CCreatureHandler.h"

lib/mapObjects/CArmedInstance.h

@@ -4,7 +4,7 @@
 #include "../CCreatureSet.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CArmedInstance.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CBank.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CBank.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -9,10 +9,10 @@
  */
 
 #include "StdInc.h"
-#include "CGBank.h"
+#include "CBank.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
 #include "../client/CSoundBase.h"
 
 using namespace boost::assign;

lib/mapObjects/CBank.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CBank.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CGHeroInstance.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CGHeroInstance.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,11 +11,11 @@
 #include "StdInc.h"
 #include "CGHeroInstance.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
-#include "CHeroHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
+#include "../CHeroHandler.h"
 #include "../client/CSoundBase.h"
-#include "CSpellHandler.h"
+#include "../CSpellHandler.h"
 #include "CObjectClassesHandler.h"
 
 

lib/mapObjects/CGHeroInstance.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../CArtHandler.h" // For CArtifactSet
 #include "../CRandomGenerator.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CGHeroInstance.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CGMarket.cpp

@@ -1,5 +1,6 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ *
+ * CGMarket.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,8 +12,8 @@
 #include "StdInc.h"
 #include "CGMarket.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
 
 using namespace boost::assign;
 

lib/mapObjects/CGMarket.h

@@ -3,7 +3,7 @@
 #include "CObjectHandler.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CGMarket.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CGPandoraBox.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CGPandoraBox.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,7 +11,7 @@
 #include "StdInc.h"
 #include "CGPandoraBox.h"
 
-#include "NetPacks.h"
+#include "../NetPacks.h"
 #include "../client/CSoundBase.h"
 
 #include "../CSpellHandler.h"

lib/mapObjects/CGPandoraBox.h

@@ -1,11 +1,10 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
-
+#include "CArmedInstance.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CGPandoraBox.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CGTownInstance.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CGTownInstance.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,7 +11,7 @@
 #include "StdInc.h"
 #include "CGTownInstance.h"
 
-#include "NetPacks.h"
+#include "../NetPacks.h"
 #include "../CGeneralTextHandler.h"
 
 using namespace boost::assign;

lib/mapObjects/CGTownInstance.h

@@ -2,12 +2,12 @@
 
 #include "CObjectHandler.h"
 #include "CGMarket.h" // For IMarket interface
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../CTownHandler.h" // For CTown
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CGTownInstance.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CObjectClassesHandler.cpp

@@ -1,14 +1,14 @@
 #include "StdInc.h"
 #include "CObjectClassesHandler.h"
 
-#include "filesystem/Filesystem.h"
-#include "filesystem/CBinaryReader.h"
+#include "../filesystem/Filesystem.h"
+#include "../filesystem/CBinaryReader.h"
 #include "../lib/VCMI_Lib.h"
-#include "GameConstants.h"
-#include "StringConstants.h"
-#include "CGeneralTextHandler.h"
-#include "CModHandler.h"
-#include "JsonNode.h"
+#include "../GameConstants.h"
+#include "../StringConstants.h"
+#include "../CGeneralTextHandler.h"
+#include "../CModHandler.h"
+#include "../JsonNode.h"
 
 #include "CRewardableConstructor.h"
 #include "MapObjects.h"

lib/mapObjects/CObjectHandler.cpp

@@ -11,9 +11,9 @@
 #include "StdInc.h"
 #include "CObjectHandler.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
-#include "CHeroHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
+#include "../CHeroHandler.h"
 #include "../client/CSoundBase.h"
 
 #include "CObjectClassesHandler.h"

lib/mapObjects/CQuest.cpp

@@ -1,5 +1,6 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ *
+ * CQuest.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,7 +12,7 @@
 #include "StdInc.h"
 #include "CQuest.h"
 
-#include "NetPacks.h"
+#include "../NetPacks.h"
 #include "../client/CSoundBase.h"
 #include "../CGeneralTextHandler.h"
 #include "../CHeroHandler.h"

lib/mapObjects/CQuest.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../CCreatureSet.h"
 #include "../NetPacksBase.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CQuest.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CRewardableConstructor.cpp

@@ -1,12 +1,12 @@
 #include "StdInc.h"
 #include "CRewardableConstructor.h"
 
-#include "CRandomGenerator.h"
-#include "StringConstants.h"
-#include "CCreatureHandler.h"
+#include "../CRandomGenerator.h"
+#include "../StringConstants.h"
+#include "../CCreatureHandler.h"
 
 /*
- * CObjectConstructor.cpp, part of VCMI engine
+ * CRewardableConstructor.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CRewardableConstructor.h

@@ -6,7 +6,7 @@
 #include "../JsonNode.h"
 
 /*
- * CObjectConstructor.h, part of VCMI engine
+ * CRewardableConstructor.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CRewardableObject.cpp

@@ -1,4 +1,5 @@
 /*
+ *
  * CRewardableObject.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
@@ -10,10 +11,10 @@
 
 #include "StdInc.h"
 #include "CRewardableObject.h"
-#include "CHeroHandler.h"
-#include "CGeneralTextHandler.h"
+#include "../CHeroHandler.h"
+#include "../CGeneralTextHandler.h"
 #include "../client/CSoundBase.h"
-#include "NetPacks.h"
+#include "../NetPacks.h"
 
 #include "CObjectClassesHandler.h"
 

lib/mapObjects/CRewardableObject.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../NetPacksBase.h"
 

lib/mapObjects/MapObjects.h

@@ -14,8 +14,8 @@
 // Possible TODO - remove this header after CObjectHandler.cpp will be fully split into smaller files
 #include "CObjectHandler.h"
 
-#include "CGArmedInstance.h"
-#include "CGBank.h"
+#include "CArmedInstance.h"
+#include "CBank.h"
 #include "CGHeroInstance.h"
 #include "CGMarket.h"
 #include "CGTownInstance.h"

lib/mapObjects/MiscObjects.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * MiscObjects.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,9 +11,8 @@
 #include "StdInc.h"
 #include "MiscObjects.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
-//#include "CHeroHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
 #include "../client/CSoundBase.h"
 
 #include "CObjectClassesHandler.h"

lib/mapObjects/MiscObjects.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * MiscObjects.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/ObjectTemplate.cpp

@@ -1,15 +1,15 @@
 #include "StdInc.h"
 #include "CObjectClassesHandler.h"
 
-#include "filesystem/Filesystem.h"
-#include "filesystem/CBinaryReader.h"
+#include "../filesystem/Filesystem.h"
+#include "../filesystem/CBinaryReader.h"
 #include "../lib/VCMI_Lib.h"
-#include "GameConstants.h"
-#include "StringConstants.h"
-#include "CGeneralTextHandler.h"
+#include "../GameConstants.h"
+#include "../StringConstants.h"
+#include "../CGeneralTextHandler.h"
 #include "CObjectHandler.h"
-#include "CModHandler.h"
-#include "JsonNode.h"
+#include "../CModHandler.h"
+#include "../JsonNode.h"
 
 #include "CRewardableConstructor.h"
 

lib/mapObjects/ObjectTemplate.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GameConstants.h"
+#include "../GameConstants.h"
 
 /*
  * ObjectTemplate.h, part of VCMI engine