diff options
| -rw-r--r-- | engines/wintermute/Base/BSoundMgr.cpp | 1 | ||||
| -rw-r--r-- | engines/wintermute/Base/BSoundMgr.h | 3 | ||||
| -rw-r--r-- | engines/wintermute/Base/BSurfaceSDL.h | 1 | ||||
| -rw-r--r-- | engines/wintermute/Base/PartEmitter.cpp | 1 | ||||
| -rw-r--r-- | engines/wintermute/Base/PartEmitter.h | 3 | ||||
| -rw-r--r-- | engines/wintermute/Base/PartParticle.h | 4 |
6 files changed, 6 insertions, 7 deletions
diff --git a/engines/wintermute/Base/BSoundMgr.cpp b/engines/wintermute/Base/BSoundMgr.cpp index bac53f6b22..dc9f3e9011 100644 --- a/engines/wintermute/Base/BSoundMgr.cpp +++ b/engines/wintermute/Base/BSoundMgr.cpp @@ -33,6 +33,7 @@ #include "engines/wintermute/utils/StringUtil.h"
#include "engines/wintermute/Base/BGame.h"
#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/Base/BSoundBuffer.h"
namespace WinterMute {
diff --git a/engines/wintermute/Base/BSoundMgr.h b/engines/wintermute/Base/BSoundMgr.h index 83d24d87ca..313823449d 100644 --- a/engines/wintermute/Base/BSoundMgr.h +++ b/engines/wintermute/Base/BSoundMgr.h @@ -31,10 +31,9 @@ #include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/Base/BBase.h"
-#include "engines/wintermute/Base/BSoundBuffer.h"
namespace WinterMute {
-
+class CBSoundBuffer;
class CBSoundMgr : public CBBase {
public:
float posToPan(int X, int Y);
diff --git a/engines/wintermute/Base/BSurfaceSDL.h b/engines/wintermute/Base/BSurfaceSDL.h index 6301310f01..1c5c3c3e15 100644 --- a/engines/wintermute/Base/BSurfaceSDL.h +++ b/engines/wintermute/Base/BSurfaceSDL.h @@ -31,7 +31,6 @@ #include "graphics/surface.h"
#include "engines/wintermute/Base/BSurface.h"
-#include "graphics/surface.h"
namespace WinterMute {
class TransparentSurface;
diff --git a/engines/wintermute/Base/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp index 09afdcc6b4..4bf6b8ece0 100644 --- a/engines/wintermute/Base/PartEmitter.cpp +++ b/engines/wintermute/Base/PartEmitter.cpp @@ -28,6 +28,7 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/Base/PartEmitter.h"
+#include "engines/wintermute/Base/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/PartEmitter.h index 69ab35053d..98eed9e678 100644 --- a/engines/wintermute/Base/PartEmitter.h +++ b/engines/wintermute/Base/PartEmitter.h @@ -31,12 +31,11 @@ #include "engines/wintermute/Base/BObject.h"
-#include "engines/wintermute/Base/PartParticle.h"
#include "engines/wintermute/Base/PartForce.h"
namespace WinterMute {
class CBRegion;
-
+class CPartParticle;
class CPartEmitter : public CBObject {
public:
DECLARE_PERSISTENT(CPartEmitter, CBObject)
diff --git a/engines/wintermute/Base/PartParticle.h b/engines/wintermute/Base/PartParticle.h index 04f33c2cce..e86c1004ae 100644 --- a/engines/wintermute/Base/PartParticle.h +++ b/engines/wintermute/Base/PartParticle.h @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#ifndef WINTERMUTE_PATRPARTICLE_H
-#define WINTERMUTE_PATRPARTICLE_H
+#ifndef WINTERMUTE_PARTPARTICLE_H
+#define WINTERMUTE_PARTPARTICLE_H
#include "engines/wintermute/Base/BBase.h"
|