Mass refactoring part 2/2: fixing include paths and project files

src/Core/Resource/Script/CMasterTemplate.cpp

@@ -1,6 +1,6 @@
 #include "CMasterTemplate.h"
-#include "../factory/CWorldLoader.h"
-#include <Core/Log.h>
+#include "Core/Resource/Factory/CWorldLoader.h"
+#include "Core/Log.h"
 
 CMasterTemplate::CMasterTemplate()
 {

src/Core/Resource/Script/CMasterTemplate.h

@@ -2,10 +2,9 @@
 #define CMASTERTEMPLATE_H
 
 #include "CScriptTemplate.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/EFormatVersion.h"
 #include <Common/types.h>
 #include <map>
-#include <tinyxml2.h>
 
 class CMasterTemplate
 {

src/Core/Resource/Script/CProperty.h

@@ -1,19 +1,17 @@
 #ifndef CPROPERTY
 #define CPROPERTY
 
-/*
- * This header file declares some classes used to track script object properties
+/* This header file declares some classes used to track script object properties
  * CPropertyBase, __CProperty (and typedefs), CPropertyStruct
- * It's a bit hard to read, should be reorganized at some point
- */
-#include "../CResource.h"
-#include "../CAnimationParameters.h"
+ * It's a bit hard to read, should be reorganized at some point */
 #include "CPropertyTemplate.h"
 #include "EPropertyType.h"
+#include "Core/Resource/CResource.h"
+#include "Core/Resource/TResPtr.h"
+#include "Core/Resource/CAnimationParameters.h"
+#include <Common/Math/CVector3f.h>
 #include <Common/CColor.h>
-#include <Common/CVector3f.h>
 #include <Common/TString.h>
-#include <Core/TResPtr.h>
 #include <list>
 
 class CScriptTemplate;

src/Core/Resource/Script/CScriptObject.cpp

@@ -1,6 +1,6 @@
 #include "CScriptObject.h"
-#include "../CAnimSet.h"
 #include "CMasterTemplate.h"
+#include "Core/Resource/CAnimSet.h"
 
 CScriptObject::CScriptObject(CGameArea *pArea, CScriptLayer *pLayer, CScriptTemplate *pTemplate)
 {

src/Core/Resource/Script/CScriptObject.h

@@ -5,9 +5,9 @@
 #include "CProperty.h"
 #include "CPropertyTemplate.h"
 #include "CScriptTemplate.h"
-#include "../model/CModel.h"
-#include "../CCollisionMeshGroup.h"
-#include "../CGameArea.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/CCollisionMeshGroup.h"
+#include "Core/Resource/CGameArea.h"
 
 class CScriptLayer;
 

src/Core/Resource/Script/CScriptTemplate.cpp

@@ -1,11 +1,12 @@
 #include "CScriptTemplate.h"
 #include "CScriptObject.h"
 #include "CMasterTemplate.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Resource/CAnimSet.h"
+#include "Core/Log.h"
+
 #include <iostream>
 #include <string>
-#include <Core/Log.h>
-#include <Core/CResCache.h>
-#include <Resource/CAnimSet.h>
 
 CScriptTemplate::CScriptTemplate(CMasterTemplate *pMaster)
 {

src/Core/Resource/Script/CScriptTemplate.h

@@ -5,13 +5,12 @@
 #include "CProperty.h"
 #include "EPropertyType.h"
 #include "EVolumeShape.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/CCollisionMeshGroup.h"
 #include <Common/CFourCC.h>
 #include <Common/types.h>
 #include <list>
 #include <vector>
-#include <tinyxml2.h>
-#include <Resource/model/CModel.h>
-#include <Resource/CCollisionMeshGroup.h>
 
 class CMasterTemplate;
 class CScriptObject;