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

31 files changed, 51 insertions, 51 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"

 

diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index bf1bc5c34b..cd7dc07925 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -30,8 +30,8 @@
 #include "engines/wintermute/Base/BGame.h"

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

 #include "engines/wintermute/Base/BFileManager.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/BImage.h"

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

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

diff --git a/engines/wintermute/Base/BFont.cpp b/engines/wintermute/Base/font/BFont.cpp
index 1849401e53..b59188d0c1 100644
--- a/engines/wintermute/Base/BFont.cpp
+++ b/engines/wintermute/Base/font/BFont.cpp
@@ -27,11 +27,11 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

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

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

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

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

 

 namespace WinterMute {

diff --git a/engines/wintermute/Base/BFont.h b/engines/wintermute/Base/font/BFont.h
index ac5a79299d..ac5a79299d 100644
--- a/engines/wintermute/Base/BFont.h
+++ b/engines/wintermute/Base/font/BFont.h
diff --git a/engines/wintermute/Base/BFontBitmap.cpp b/engines/wintermute/Base/font/BFontBitmap.cpp
index b913eea3ee..681f2580bf 100644
--- a/engines/wintermute/Base/BFontBitmap.cpp
+++ b/engines/wintermute/Base/font/BFontBitmap.cpp
@@ -27,7 +27,7 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

diff --git a/engines/wintermute/Base/BFontBitmap.h b/engines/wintermute/Base/font/BFontBitmap.h
index 3cd0d91e77..b834f919b9 100644
--- a/engines/wintermute/Base/BFontBitmap.h
+++ b/engines/wintermute/Base/font/BFontBitmap.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFONTBITMAP_H

 

 

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

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

 

 namespace WinterMute {

 class CBSubFrame;

diff --git a/engines/wintermute/Base/BFontStorage.cpp b/engines/wintermute/Base/font/BFontStorage.cpp
index 8b43510708..5a0a1e327f 100644
--- a/engines/wintermute/Base/BFontStorage.cpp
+++ b/engines/wintermute/Base/font/BFontStorage.cpp
@@ -27,9 +27,9 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/Base/BFontStorage.h b/engines/wintermute/Base/font/BFontStorage.h
index 33a1bb056f..33a1bb056f 100644
--- a/engines/wintermute/Base/BFontStorage.h
+++ b/engines/wintermute/Base/font/BFontStorage.h
diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/font/BFontTT.cpp
index 10d552d4e2..ec20c0e393 100644
--- a/engines/wintermute/Base/BFontTT.cpp
+++ b/engines/wintermute/Base/font/BFontTT.cpp
@@ -28,7 +28,7 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/Base/file/BFile.h"

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

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

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

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

 #include "engines/wintermute/math/MathUtil.h"

diff --git a/engines/wintermute/Base/BFontTT.h b/engines/wintermute/Base/font/BFontTT.h
index c585ca2070..1ee9f1d105 100644
--- a/engines/wintermute/Base/BFontTT.h
+++ b/engines/wintermute/Base/font/BFontTT.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BFONTTT_H

 #define WINTERMUTE_BFONTTT_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/BSurface.h"

 #include "common/rect.h"

 #include "graphics/surface.h"

diff --git a/engines/wintermute/Base/PartEmitter.cpp b/engines/wintermute/Base/particles/PartEmitter.cpp
index c3efc74eec..9a92d2aa6e 100644
--- a/engines/wintermute/Base/PartEmitter.cpp
+++ b/engines/wintermute/Base/particles/PartEmitter.cpp
@@ -27,8 +27,8 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

 #include "engines/wintermute/math/Vector2.h"

 #include "engines/wintermute/math/Matrix4.h"

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

diff --git a/engines/wintermute/Base/PartEmitter.h b/engines/wintermute/Base/particles/PartEmitter.h
index e2de466e42..6f517bf357 100644
--- a/engines/wintermute/Base/PartEmitter.h
+++ b/engines/wintermute/Base/particles/PartEmitter.h
@@ -31,7 +31,7 @@
 

 

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

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

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

 

 namespace WinterMute {

 class CBRegion;

diff --git a/engines/wintermute/Base/PartForce.cpp b/engines/wintermute/Base/particles/PartForce.cpp
index b60d5447d9..2da74da14d 100644
--- a/engines/wintermute/Base/PartForce.cpp
+++ b/engines/wintermute/Base/particles/PartForce.cpp
@@ -28,7 +28,7 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/persistent.h"

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

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

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

 

 namespace WinterMute {

diff --git a/engines/wintermute/Base/PartForce.h b/engines/wintermute/Base/particles/PartForce.h
index cf5d697a79..cf5d697a79 100644
--- a/engines/wintermute/Base/PartForce.h
+++ b/engines/wintermute/Base/particles/PartForce.h
diff --git a/engines/wintermute/Base/PartParticle.cpp b/engines/wintermute/Base/particles/PartParticle.cpp
index f3a8de9ece..10a8e6f51b 100644
--- a/engines/wintermute/Base/PartParticle.cpp
+++ b/engines/wintermute/Base/particles/PartParticle.cpp
@@ -27,8 +27,8 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

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

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

diff --git a/engines/wintermute/Base/PartParticle.h b/engines/wintermute/Base/particles/PartParticle.h
index aed559d337..aed559d337 100644
--- a/engines/wintermute/Base/PartParticle.h
+++ b/engines/wintermute/Base/particles/PartParticle.h
diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index 65a643b9d3..85932ca603 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -33,8 +33,8 @@
 #include "engines/wintermute/UI/UITiledImage.h"

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

 #include "engines/wintermute/Base/BActiveRect.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/BStringTable.h"

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

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

diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index 778e084ab9..b47885b4dc 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -32,8 +32,8 @@
 #include "engines/wintermute/utils/StringUtil.h"

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

 #include "engines/wintermute/Base/BFileManager.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/BKeyboardState.h"

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

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

diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp
index 668d4eb234..6c33bd9509 100644
--- a/engines/wintermute/UI/UIObject.cpp
+++ b/engines/wintermute/UI/UIObject.cpp
@@ -34,7 +34,7 @@
 #include "engines/wintermute/PlatformSDL.h"

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index 44fb695687..ba8191c204 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -33,8 +33,8 @@
 #include "engines/wintermute/Base/BGame.h"

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

 #include "engines/wintermute/Base/scriptables/ScValue.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/BStringTable.h"

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

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

diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index de17966ac5..f16e3afba1 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -39,8 +39,8 @@
 #include "engines/wintermute/UI/UIText.h"

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

 #include "engines/wintermute/Base/BViewport.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/BStringTable.h"

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

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

diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 8dbdd94b0a..a185f08e13 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -43,6 +43,13 @@ MODULE_OBJS := \
 	Base/file/BFile.o \
 	Base/file/BSaveThumbFile.o \
 	Base/file/BPkgFile.o \
+	Base/font/BFontBitmap.o \
+	Base/font/BFontTT.o \
+	Base/font/BFont.o \
+	Base/font/BFontStorage.o \
+	Base/particles/PartParticle.o \
+	Base/particles/PartEmitter.o \
+	Base/particles/PartForce.o \
 	Base/BActiveRect.o \
 	Base/BBase.o \
 	Base/BDebugger.o \
@@ -51,10 +58,6 @@ MODULE_OBJS := \
 	Base/BFileEntry.o \
 	Base/BFileManager.o \
 	Base/BGame.o \
-	Base/BFont.o \
-	Base/BFontBitmap.o \
-	Base/BFontStorage.o \
-	Base/BFontTT.o \
 	Base/BFrame.o \
 	Base/BImage.o \
 	Base/BKeyboardState.o \
@@ -84,9 +87,6 @@ MODULE_OBJS := \
 	Base/BSurfaceStorage.o \
 	Base/BTransitionMgr.o \
 	Base/BViewport.o \
-	Base/PartParticle.o \
-	Base/PartEmitter.o \
-	Base/PartForce.o \
 	detection.o \
 	graphics/transparentSurface.o \
 	graphics/tga.o \
diff --git a/engines/wintermute/persistent.cpp b/engines/wintermute/persistent.cpp
index 8d451aad7b..b753b58d26 100644
--- a/engines/wintermute/persistent.cpp
+++ b/engines/wintermute/persistent.cpp
@@ -53,9 +53,9 @@
 #include "engines/wintermute/Ad/AdTalkNode.h"
 #include "engines/wintermute/Ad/AdWaypointGroup.h"
 #include "engines/wintermute/Base/BFader.h"
-#include "engines/wintermute/Base/BFontBitmap.h"
-#include "engines/wintermute/Base/BFontStorage.h"
-#include "engines/wintermute/Base/BFontTT.h"
+#include "engines/wintermute/Base/font/BFontBitmap.h"
+#include "engines/wintermute/Base/font/BFontStorage.h"
+#include "engines/wintermute/Base/font/BFontTT.h"
 #include "engines/wintermute/Base/BFrame.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BKeyboardState.h"