WINTERMUTE: Move font & particle emitter-related code to it's own subfolder

9 files changed, 14 insertions, 14 deletions

diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index 599afee626..3d9c7f5055 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -39,8 +39,8 @@
 #include "engines/wintermute/Ad/AdScene.h"

 #include "engines/wintermute/Base/BSound.h"

 #include "engines/wintermute/Ad/AdWaypointGroup.h"

-#include "engines/wintermute/Base/BFontStorage.h"

-#include "engines/wintermute/Base/BFont.h"

+#include "engines/wintermute/Base/font/BFontStorage.h"

+#include "engines/wintermute/Base/font/BFont.h"

 #include "engines/wintermute/Ad/AdSentence.h"

 #include "engines/wintermute/Base/BRegion.h"

 #include "engines/wintermute/Base/BSprite.h"

diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index ed31cd3acb..759c212de8 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -40,7 +40,7 @@
 #include "engines/wintermute/Ad/AdSceneState.h"

 #include "engines/wintermute/Ad/AdSentence.h"

 #include "engines/wintermute/Base/BFileManager.h"

-#include "engines/wintermute/Base/BFont.h"

+#include "engines/wintermute/Base/font/BFont.h"

 #include "engines/wintermute/Base/BObject.h"

 #include "engines/wintermute/Base/BParser.h"

 #include "engines/wintermute/Base/BSound.h"

@@ -49,7 +49,7 @@
 #include "engines/wintermute/Base/BTransitionMgr.h"

 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/Base/BViewport.h"

-#include "engines/wintermute/Base/PartEmitter.h"

+#include "engines/wintermute/Base/particles/PartEmitter.h"

 #include "engines/wintermute/Base/scriptables/ScEngine.h"

 #include "engines/wintermute/Base/scriptables/ScScript.h"

 #include "engines/wintermute/Base/scriptables/ScStack.h"

diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index e8c32607dc..a728a8d048 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -30,8 +30,8 @@
 #include "engines/wintermute/Ad/AdItem.h"

 #include "engines/wintermute/Ad/AdGame.h"

 #include "engines/wintermute/Ad/AdSentence.h"

-#include "engines/wintermute/Base/BFontStorage.h"

-#include "engines/wintermute/Base/BFont.h"

+#include "engines/wintermute/Base/font/BFontStorage.h"

+#include "engines/wintermute/Base/font/BFont.h"

 #include "engines/wintermute/Base/BFileManager.h"

 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BParser.h"

diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 06c63a4d1b..4dd6f4ce4b 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -41,8 +41,8 @@
 #include "engines/wintermute/Base/BSound.h"

 #include "engines/wintermute/Base/BSurfaceStorage.h"

 #include "engines/wintermute/Base/BSubFrame.h"

-#include "engines/wintermute/Base/BFont.h"

-#include "engines/wintermute/Base/BFontStorage.h"

+#include "engines/wintermute/Base/font/BFont.h"

+#include "engines/wintermute/Base/font/BFontStorage.h"

 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/Base/BStringTable.h"

 #include "engines/wintermute/Base/scriptables/ScEngine.h"

diff --git a/engines/wintermute/Ad/AdObject.h b/engines/wintermute/Ad/AdObject.h
index c71efce1a5..546089bada 100644
--- a/engines/wintermute/Ad/AdObject.h
+++ b/engines/wintermute/Ad/AdObject.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADOBJECT_H

 

 #include "engines/wintermute/Ad/AdTypes.h"

-#include "engines/wintermute/Base/PartEmitter.h"

+#include "engines/wintermute/Base/particles/PartEmitter.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdResponse.cpp b/engines/wintermute/Ad/AdResponse.cpp
index 7c6d3f56c9..0b0bea2f57 100644
--- a/engines/wintermute/Ad/AdResponse.cpp
+++ b/engines/wintermute/Ad/AdResponse.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/Ad/AdResponse.h"

 #include "engines/wintermute/Base/BGame.h"

-#include "engines/wintermute/Base/BFontStorage.h"

+#include "engines/wintermute/Base/font/BFontStorage.h"

 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/utils/utils.h"

 

diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index cb9a0496d1..c055c2f363 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -34,8 +34,8 @@
 #include "engines/wintermute/UI/UIButton.h"

 #include "engines/wintermute/UI/UIWindow.h"

 #include "engines/wintermute/Base/BDynBuffer.h"

-#include "engines/wintermute/Base/BFontStorage.h"

-#include "engines/wintermute/Base/BFont.h"

+#include "engines/wintermute/Base/font/BFontStorage.h"

+#include "engines/wintermute/Base/font/BFont.h"

 #include "engines/wintermute/Ad/AdResponse.h"

 #include "engines/wintermute/Base/scriptables/ScScript.h"

 #include "engines/wintermute/Base/scriptables/ScStack.h"

diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index 41b413cc14..b338232c98 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -43,7 +43,7 @@
 #include "engines/wintermute/Ad/AdWaypointGroup.h"

 #include "engines/wintermute/Base/BDynBuffer.h"

 #include "engines/wintermute/Base/BFileManager.h"

-#include "engines/wintermute/Base/BFont.h"

+#include "engines/wintermute/Base/font/BFont.h"

 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BObject.h"

 #include "engines/wintermute/Base/BParser.h"

diff --git a/engines/wintermute/Ad/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp
index ed43630e0c..7d37efce49 100644
--- a/engines/wintermute/Ad/AdSentence.cpp
+++ b/engines/wintermute/Ad/AdSentence.cpp
@@ -35,7 +35,7 @@
 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BSound.h"

 #include "engines/wintermute/Ad/AdScene.h"

-#include "engines/wintermute/Base/BFont.h"

+#include "engines/wintermute/Base/font/BFont.h"

 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/Base/BFileManager.h"