WINTERMUTE: Add folders for utils and video

engines/wintermute/Ad/AdActor.cpp

@@ -46,7 +46,7 @@
 #include "engines/wintermute/Base/scriptables/ScScript.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include <math.h>
 

engines/wintermute/Ad/AdEntity.cpp

@@ -46,7 +46,7 @@
 #include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScScript.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"

engines/wintermute/Ad/AdGame.cpp

@@ -56,7 +56,7 @@
 #include "engines/wintermute/Base/scriptables/ScStack.h"
 #include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "common/str.h"
 
 namespace WinterMute {

engines/wintermute/Ad/AdItem.cpp

@@ -37,7 +37,7 @@
 #include "engines/wintermute/Base/BParser.h"
 #include "engines/wintermute/Base/BSound.h"
 #include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/Base/scriptables/ScScript.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"

engines/wintermute/Ad/AdNodeState.cpp

@@ -32,7 +32,7 @@
 #include "engines/wintermute/Ad/AdEntity.h"
 #include "engines/wintermute/Base/BStringTable.h"
 #include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 

engines/wintermute/Ad/AdResponse.cpp

@@ -31,7 +31,7 @@
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BFontStorage.h"
 #include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 
 namespace WinterMute {
 

engines/wintermute/Ad/AdResponseBox.cpp

@@ -41,7 +41,7 @@
 #include "engines/wintermute/Base/scriptables/ScStack.h"
 #include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 

engines/wintermute/Ad/AdScene.cpp

@@ -57,7 +57,7 @@
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScScript.h"
 #include "engines/wintermute/UI/UIWindow.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include <math.h>
 #include <limits.h>
 

engines/wintermute/Ad/AdSentence.cpp

@@ -31,7 +31,7 @@
 #include "engines/wintermute/Ad/AdTalkDef.h"
 #include "engines/wintermute/Ad/AdTalkNode.h"
 #include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/PathUtil.h"
+#include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BSound.h"
 #include "engines/wintermute/Ad/AdScene.h"

engines/wintermute/Ad/AdTalkDef.cpp

@@ -35,7 +35,7 @@
 #include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/Ad/AdSpriteSet.h"
 #include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 
 namespace WinterMute {
 

engines/wintermute/Ad/AdTalkNode.cpp

@@ -33,7 +33,7 @@
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/Ad/AdSpriteSet.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 namespace WinterMute {
 
 IMPLEMENT_PERSISTENT(CAdTalkNode, false)

engines/wintermute/Base/BFileManager.cpp

@@ -30,8 +30,8 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/StringUtil.h"
-#include "engines/wintermute/PathUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/Base/BDiskFile.h"
 #include "engines/wintermute/Base/BResourceFile.h"
 #include "engines/wintermute/Base/BSaveThumbFile.h"
@@ -41,7 +41,7 @@
 #include "engines/wintermute/Base/BRegistry.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/dcpackage.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 #include "common/textconsole.h"

engines/wintermute/Base/BFontBitmap.cpp

@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BFontBitmap.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/Base/BParser.h"
 #include "engines/wintermute/Base/BFrame.h"
 #include "engines/wintermute/Base/BSurface.h"

engines/wintermute/Base/BFontTT.cpp

@@ -32,15 +32,15 @@
 #include "engines/wintermute/Base/BFile.h"
 #include "engines/wintermute/Base/BFontTT.h"
 #include "engines/wintermute/FontGlyphCache.h"
-#include "engines/wintermute/PathUtil.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/PathUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/math/MathUtil.h"
 #include "engines/wintermute/Base/BRenderSDL.h"
 #include "engines/wintermute/Base/BSurfaceSDL.h"
 #include "engines/wintermute/Base/BParser.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "graphics/fonts/ttf.h"
 #include "graphics/fontman.h"

engines/wintermute/Base/BGame.cpp

@@ -51,9 +51,9 @@
 #include "engines/wintermute/Base/BRegion.h"
 #include "engines/wintermute/Base/BSaveThumbHelper.h"
 #include "engines/wintermute/Base/BSurfaceStorage.h"
-#include "engines/wintermute/crc.h"
-#include "engines/wintermute/PathUtil.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/crc.h"
+#include "engines/wintermute/utils/PathUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/UI/UIWindow.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScEngine.h"

engines/wintermute/Base/BPersistMgr.cpp

@@ -33,7 +33,7 @@
 #include "engines/wintermute/Base/BSaveThumbHelper.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/math/Vector2.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/Base/BImage.h"
 #include "engines/wintermute/Base/BSound.h"
 #include "common/str.h"

engines/wintermute/Base/BRegistry.cpp

@@ -29,10 +29,10 @@
 #include <fstream>
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BRegistry.h"
-#include "engines/wintermute/PathUtil.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/PathUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/tinyxml/tinyxml.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 
 namespace WinterMute {
 

engines/wintermute/Base/BSoundBuffer.cpp

@@ -32,7 +32,7 @@
 #include "engines/wintermute/Base/BSoundMgr.h"
 #include "engines/wintermute/Base/BSoundBuffer.h"
 #include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 #include "audio/decoders/vorbis.h"

engines/wintermute/Base/BSoundMgr.cpp

@@ -29,8 +29,8 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BSoundMgr.h"
 #include "engines/wintermute/Base/BRegistry.h"
-#include "engines/wintermute/PathUtil.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/PathUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BFileManager.h"
 

engines/wintermute/Base/BSprite.cpp

@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/StringUtil.h"
-#include "engines/wintermute/PathUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/Base/BParser.h"
 #include "engines/wintermute/Base/BDynBuffer.h"
 #include "engines/wintermute/Base/BSurface.h"

engines/wintermute/Base/BStringTable.cpp

@@ -30,7 +30,7 @@
 #include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BStringTable.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "common/str.h"
 
 namespace WinterMute {

engines/wintermute/Base/PartEmitter.cpp

@@ -35,7 +35,7 @@
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BRegion.h"
 #include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 

engines/wintermute/Base/PartParticle.cpp

@@ -31,7 +31,7 @@
 #include "engines/wintermute/Base/PartEmitter.h"
 #include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 #include <math.h>

engines/wintermute/Base/scriptables/SXFile.cpp

@@ -31,7 +31,7 @@
 #include "engines/wintermute/Base/scriptables/ScStack.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScScript.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BFile.h"
 #include "engines/wintermute/Base/BFileManager.h"

engines/wintermute/Base/scriptables/SXStore.cpp

@@ -32,7 +32,7 @@
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScScript.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 
 #ifdef __IPHONEOS__
 #   include "IOS_StoreKit_interface.h"

engines/wintermute/Base/scriptables/SXStore.h

@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_SXSTORE_H
 #define WINTERMUTE_SXSTORE_H
 #include "engines/wintermute/Base/BPersistMgr.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/Base/BObject.h"
 
 namespace WinterMute {

engines/wintermute/Base/scriptables/SXString.cpp

@@ -29,10 +29,10 @@
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/Base/scriptables/SXString.h"
 #include "engines/wintermute/Base/scriptables/SXArray.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 
 namespace WinterMute {
 

engines/wintermute/Base/scriptables/ScEngine.cpp

@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/scriptables/ScEngine.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScScript.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"

engines/wintermute/Base/scriptables/ScEngine.h

@@ -33,7 +33,7 @@
 #include "engines/wintermute/coll_templ.h"
 #include "engines/wintermute/Base/BBase.h"
 #include "engines/wintermute/wme_debugger.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 
 namespace WinterMute {

engines/wintermute/Base/scriptables/ScValue.cpp

@@ -31,7 +31,7 @@
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScScript.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/Base/BScriptable.h"
 
 namespace WinterMute {

engines/wintermute/PlatformSDL.cpp

@@ -29,7 +29,7 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BRenderSDL.h"
-#include "engines/wintermute/PathUtil.h"
+#include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/Base/BRegistry.h"
 #include "engines/wintermute/Base/BSoundMgr.h"

engines/wintermute/UI/UIEdit.cpp

@@ -29,7 +29,7 @@
 #include "engines/wintermute/UI/UIEdit.h"
 #include "engines/wintermute/UI/UIObject.h"
 #include "engines/wintermute/UI/UITiledImage.h"
-#include "engines/wintermute/StringUtil.h"
+#include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/Base/BActiveRect.h"
 #include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/Base/BFont.h"
@@ -44,7 +44,7 @@
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"
 #include "engines/wintermute/Base/scriptables/ScScript.h"
-#include "engines/wintermute/utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "common/util.h"
 #include "common/keyboard.h"
 

engines/wintermute/module.mk

@@ -1,18 +1,6 @@
 MODULE := engines/wintermute
  
 MODULE_OBJS := \
-	Base/scriptables/ScEngine.o \
-	Base/scriptables/ScScript.o \
-	Base/scriptables/ScStack.o \
-	Base/scriptables/ScValue.o \
-	Base/scriptables/SXArray.o \
-	Base/scriptables/SXDate.o \
-	Base/scriptables/SXFile.o \
-	Base/scriptables/SXMath.o \
-	Base/scriptables/SxObject.o \
-	Base/scriptables/SXMemBuffer.o \
-	Base/scriptables/SXStore.o \
-	Base/scriptables/SXString.o \
 	Ad/AdActor.o \
 	Ad/AdActorDir.o \
 	Ad/AdEntity.o \
@@ -40,6 +28,18 @@ MODULE_OBJS := \
 	Ad/AdTalkHolder.o \
 	Ad/AdTalkNode.o \
 	Ad/AdWaypointGroup.o \
+	Base/scriptables/ScEngine.o \
+	Base/scriptables/ScScript.o \
+	Base/scriptables/ScStack.o \
+	Base/scriptables/ScValue.o \
+	Base/scriptables/SXArray.o \
+	Base/scriptables/SXDate.o \
+	Base/scriptables/SXFile.o \
+	Base/scriptables/SXMath.o \
+	Base/scriptables/SxObject.o \
+	Base/scriptables/SXMemBuffer.o \
+	Base/scriptables/SXStore.o \
+	Base/scriptables/SXString.o \
 	Base/BActiveRect.o \
 	Base/BBase.o \
 	Base/BDebugger.o \
@@ -86,8 +86,9 @@ MODULE_OBJS := \
 	Base/BSurfaceStorage.o \
 	Base/BTransitionMgr.o \
 	Base/BViewport.o \
-	ConvertUTF.o \
-	crc.o \
+	Base/PartParticle.o \
+	Base/PartEmitter.o \
+	Base/PartForce.o \
 	detection.o \
 	FontGlyphCache.o \
 	graphics/transparentSurface.o \
@@ -95,12 +96,7 @@ MODULE_OBJS := \
 	math/MathUtil.o \
 	math/Matrix4.o \
 	math/Vector2.o \
-	PathUtil.o \
-	Base/PartParticle.o \
-	Base/PartEmitter.o \
-	Base/PartForce.o \
 	PlatformSDL.o \
-	StringUtil.o \
 	Sys/SysClass.o \
 	Sys/SysClassRegistry.o \
 	Sys/SysInstance.o \
@@ -115,9 +111,13 @@ MODULE_OBJS := \
 	UI/UIText.o \
 	UI/UITiledImage.o \
 	UI/UIWindow.o \
-	utils.o \
-	VidPlayer.o \
-	VidTheoraPlayer.o \
+	utils/ConvertUTF.o \
+	utils/crc.o \
+	utils/PathUtil.o \
+	utils/StringUtil.o \
+	utils/utils.o \
+	video/VidPlayer.o \
+	video/VidTheoraPlayer.o \
 	wintermute.o
  
 MODULE_DIRS += \

engines/wintermute/video/VidTheoraPlayer.cpp

@@ -18,7 +18,7 @@
 
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/vidtheoraplayer.h"
+#include "engines/wintermute/video/vidtheoraplayer.h"
 
 //#pragma comment(lib, "libtheora.lib")