aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/wintermute/AdActor.cpp46
-rw-r--r--engines/wintermute/AdInventoryBox.cpp12
-rw-r--r--engines/wintermute/AdItem.cpp32
-rw-r--r--engines/wintermute/AdLayer.cpp6
-rw-r--r--engines/wintermute/AdObject.cpp8
-rw-r--r--engines/wintermute/AdRegion.cpp4
-rw-r--r--engines/wintermute/AdResponseBox.cpp4
-rw-r--r--engines/wintermute/AdScene.cpp6
-rw-r--r--engines/wintermute/AdSpriteSet.cpp1
-rw-r--r--engines/wintermute/AdTalkHolder.cpp6
-rw-r--r--engines/wintermute/AdWaypointGroup.cpp2
-rw-r--r--engines/wintermute/BGame.h12
-rw-r--r--engines/wintermute/module.mk24
13 files changed, 93 insertions, 70 deletions
diff --git a/engines/wintermute/AdActor.cpp b/engines/wintermute/AdActor.cpp
index a5d269e13a..12aa363df1 100644
--- a/engines/wintermute/AdActor.cpp
+++ b/engines/wintermute/AdActor.cpp
@@ -26,30 +26,28 @@
* Copyright (c) 2011 Jan Nedoma
*/
-#include "dcgf.h"
-#include "dctypes.h"
-#include "persistent.h"
-#include "BObject.h"
-#include "AdActor.h"
-#include "AdGame.h"
-#include "BParser.h"
-#include "ScValue.h"
-#include "ScStack.h"
-#include "BObject.h"
-#include "BSound.h"
-#include "AdScene.h"
-#include "AdEntity.h"
-#include "AdSpriteSet.h"
-#include "AdWaypointGroup.h"
-#include "AdPath.h"
-#include "AdSentence.h"
-#include "AdPath.h"
-#include "ScScript.h"
-#include "BRegion.h"
-#include "BFileManager.h"
-#include "AdPath.h"
-#include "utils.h"
-#include "PlatformSDL.h"
+#include "engines/wintermute/dcgf.h"
+#include "engines/wintermute/dctypes.h"
+#include "engines/wintermute/persistent.h"
+#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/AdActor.h"
+#include "engines/wintermute/AdGame.h"
+#include "engines/wintermute/AdScene.h"
+#include "engines/wintermute/AdEntity.h"
+#include "engines/wintermute/AdSpriteSet.h"
+#include "engines/wintermute/AdWaypointGroup.h"
+#include "engines/wintermute/AdPath.h"
+#include "engines/wintermute/AdSentence.h"
+#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/BParser.h"
+#include "engines/wintermute/BSound.h"
+#include "engines/wintermute/BRegion.h"
+#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/scriptables/ScScript.h"
+#include "engines/wintermute/scriptables/ScValue.h"
+#include "engines/wintermute/scriptables/ScStack.h"
+#include "engines/wintermute/utils.h"
+#include "engines/wintermute/PlatformSDL.h"
#include <math.h>
namespace WinterMute {
diff --git a/engines/wintermute/AdInventoryBox.cpp b/engines/wintermute/AdInventoryBox.cpp
index afaa139a6a..5af10d5f86 100644
--- a/engines/wintermute/AdInventoryBox.cpp
+++ b/engines/wintermute/AdInventoryBox.cpp
@@ -26,17 +26,17 @@
* Copyright (c) 2011 Jan Nedoma
*/
#include "dcgf.h"
+#include "AdGame.h"
#include "AdInventoryBox.h"
#include "AdInventory.h"
+#include "AdItem.h"
+#include "BGame.h"
#include "BParser.h"
+#include "BFileManager.h"
+#include "BViewport.h"
+#include "BDynBuffer.h"
#include "UIButton.h"
#include "UIWindow.h"
-#include "BDynBuffer.h"
-#include "BGame.h"
-#include "AdGame.h"
-#include "AdItem.h"
-#include "BViewport.h"
-#include "BFileManager.h"
#include "PlatformSDL.h"
#include "common/str.h"
#include <cmath>
diff --git a/engines/wintermute/AdItem.cpp b/engines/wintermute/AdItem.cpp
index 5a2d4d7a58..a1cf0d5b01 100644
--- a/engines/wintermute/AdItem.cpp
+++ b/engines/wintermute/AdItem.cpp
@@ -26,22 +26,22 @@
* Copyright (c) 2011 Jan Nedoma
*/
-#include "dcgf.h"
-#include "AdItem.h"
-#include "BParser.h"
-#include "ScValue.h"
-#include "BGame.h"
-#include "AdGame.h"
-#include "BSound.h"
-#include "BFontStorage.h"
-#include "BFont.h"
-#include "AdSentence.h"
-#include "ScScript.h"
-#include "ScStack.h"
-#include "BSprite.h"
-#include "BFileManager.h"
-#include "utils.h"
-#include "PlatformSDL.h"
+#include "engines/wintermute/dcgf.h"
+#include "engines/wintermute/AdItem.h"
+#include "engines/wintermute/AdGame.h"
+#include "engines/wintermute/AdSentence.h"
+#include "engines/wintermute/BFontStorage.h"
+#include "engines/wintermute/BFont.h"
+#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/BGame.h"
+#include "engines/wintermute/BParser.h"
+#include "engines/wintermute/BSound.h"
+#include "engines/wintermute/BSprite.h"
+#include "engines/wintermute/utils.h"
+#include "engines/wintermute/PlatformSDL.h"
+#include "engines/wintermute/scriptables/ScScript.h"
+#include "engines/wintermute/scriptables/ScStack.h"
+#include "engines/wintermute/scriptables/ScValue.h"
#include "common/str.h"
namespace WinterMute {
diff --git a/engines/wintermute/AdLayer.cpp b/engines/wintermute/AdLayer.cpp
index 6fc53ede7e..6e55a24161 100644
--- a/engines/wintermute/AdLayer.cpp
+++ b/engines/wintermute/AdLayer.cpp
@@ -32,9 +32,9 @@
#include "AdSceneNode.h"
#include "BParser.h"
#include "BDynBuffer.h"
-#include "ScValue.h"
-#include "ScScript.h"
-#include "ScStack.h"
+#include "engines/wintermute/scriptables/ScValue.h"
+#include "engines/wintermute/scriptables/ScScript.h"
+#include "engines/wintermute/scriptables/ScStack.h"
#include "BFileManager.h"
#include "PlatformSDL.h"
#include "common/str.h"
diff --git a/engines/wintermute/AdObject.cpp b/engines/wintermute/AdObject.cpp
index 4454d1d0f6..11552b1488 100644
--- a/engines/wintermute/AdObject.cpp
+++ b/engines/wintermute/AdObject.cpp
@@ -33,7 +33,7 @@
#include "BFrame.h"
#include "BSound.h"
#include "BSurfaceStorage.h"
-#include "ScValue.h"
+#include "engines/wintermute/scriptables/ScValue.h"
#include "AdGame.h"
#include "AdLayer.h"
#include "AdSceneNode.h"
@@ -43,12 +43,12 @@
#include "BSubFrame.h"
#include "BFont.h"
#include "BFontStorage.h"
-#include "ScEngine.h"
+#include "engines/wintermute/scriptables/ScEngine.h"
#include "BStringTable.h"
#include "AdSentence.h"
-#include "ScScript.h"
+#include "engines/wintermute/scriptables/ScScript.h"
#include "BSprite.h"
-#include "ScStack.h"
+#include "engines/wintermute/scriptables/ScStack.h"
#include "common/str.h"
namespace WinterMute {
diff --git a/engines/wintermute/AdRegion.cpp b/engines/wintermute/AdRegion.cpp
index 71a36cf636..51b4070f28 100644
--- a/engines/wintermute/AdRegion.cpp
+++ b/engines/wintermute/AdRegion.cpp
@@ -30,8 +30,8 @@
#include "AdRegion.h"
#include "BParser.h"
#include "BDynBuffer.h"
-#include "ScValue.h"
-#include "ScScript.h"
+#include "engines/wintermute/scriptables/ScValue.h"
+#include "engines/wintermute/scriptables/ScScript.h"
#include "BGame.h"
#include "BFileManager.h"
diff --git a/engines/wintermute/AdResponseBox.cpp b/engines/wintermute/AdResponseBox.cpp
index ff4407fcfc..d2ff7db96f 100644
--- a/engines/wintermute/AdResponseBox.cpp
+++ b/engines/wintermute/AdResponseBox.cpp
@@ -37,8 +37,8 @@
#include "BFontStorage.h"
#include "BFont.h"
#include "AdResponse.h"
-#include "ScScript.h"
-#include "ScStack.h"
+#include "engines/wintermute/scriptables/ScScript.h"
+#include "engines/wintermute/scriptables/ScStack.h"
#include "BSprite.h"
#include "BFileManager.h"
#include "utils.h"
diff --git a/engines/wintermute/AdScene.cpp b/engines/wintermute/AdScene.cpp
index 3fb13f5d61..37d9fdeaa5 100644
--- a/engines/wintermute/AdScene.cpp
+++ b/engines/wintermute/AdScene.cpp
@@ -53,9 +53,9 @@
#include "BSprite.h"
#include "BViewport.h"
#include "PlatformSDL.h"
-#include "ScStack.h"
-#include "ScValue.h"
-#include "ScScript.h"
+#include "engines/wintermute/scriptables/ScStack.h"
+#include "engines/wintermute/scriptables/ScValue.h"
+#include "engines/wintermute/scriptables/ScScript.h"
#include "UIWindow.h"
#include "utils.h"
#include <math.h>
diff --git a/engines/wintermute/AdSpriteSet.cpp b/engines/wintermute/AdSpriteSet.cpp
index f5974c9662..1940559330 100644
--- a/engines/wintermute/AdSpriteSet.cpp
+++ b/engines/wintermute/AdSpriteSet.cpp
@@ -32,6 +32,7 @@
#include "BDynBuffer.h"
#include "BGame.h"
#include "BFileManager.h"
+
namespace WinterMute {
IMPLEMENT_PERSISTENT(CAdSpriteSet, false)
diff --git a/engines/wintermute/AdTalkHolder.cpp b/engines/wintermute/AdTalkHolder.cpp
index 228fb77d03..74a089167a 100644
--- a/engines/wintermute/AdTalkHolder.cpp
+++ b/engines/wintermute/AdTalkHolder.cpp
@@ -29,9 +29,9 @@
#include "dcgf.h"
#include "AdTalkHolder.h"
#include "BDynBuffer.h"
-#include "ScValue.h"
-#include "ScScript.h"
-#include "ScStack.h"
+#include "engines/wintermute/scriptables/ScValue.h"
+#include "engines/wintermute/scriptables/ScScript.h"
+#include "engines/wintermute/scriptables/ScStack.h"
#include "BGame.h"
#include "BSprite.h"
#include "PlatformSDL.h"
diff --git a/engines/wintermute/AdWaypointGroup.cpp b/engines/wintermute/AdWaypointGroup.cpp
index 265612934f..bbd1cdb92a 100644
--- a/engines/wintermute/AdWaypointGroup.cpp
+++ b/engines/wintermute/AdWaypointGroup.cpp
@@ -29,7 +29,7 @@
#include "AdWaypointGroup.h"
#include "BParser.h"
#include "BDynBuffer.h"
-#include "ScValue.h"
+#include "engines/wintermute/scriptables/ScValue.h"
#include "BGame.h"
#include "BRegion.h"
#include "BFileManager.h"
diff --git a/engines/wintermute/BGame.h b/engines/wintermute/BGame.h
index a13144d325..8b74b2d618 100644
--- a/engines/wintermute/BGame.h
+++ b/engines/wintermute/BGame.h
@@ -92,10 +92,10 @@ public:
virtual HRESULT MiniUpdate() {} // <- TODO Unstub
#if 0
virtual HRESULT MiniUpdate();
-
+#endif
void GetMousePos(POINT *Pos);
RECT m_MouseLockRect;
-#endif
+
bool m_ShuttingDown;
virtual HRESULT DisplayDebugInfo();
@@ -318,9 +318,7 @@ public:
uint32 m_LiveTimerLast;
CBObject *m_CapturedObject;
-#if 0
POINT m_MousePos;
-#endif
bool ValidObject(CBObject *Object);
HRESULT UnregisterObject(CBObject *Object);
HRESULT RegisterObject(CBObject *Object);
@@ -332,7 +330,7 @@ public:
HRESULT UpdateMusicCrossfade();
CBArray<CBObject *, CBObject *> m_RegObjects;
-
+#endif
public:
virtual HRESULT DisplayContent(bool Update = true, bool DisplayAll = false);
virtual HRESULT DisplayContentSimple();
@@ -340,6 +338,7 @@ public:
void ResetMousePos();
int m_SubtitlesSpeed;
void SetInteractive(bool State);
+#if 0
virtual HRESULT WindowLoadHook(CUIWindow *Win, char **Buf, char **Params);
virtual HRESULT WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScStack *Stack, char *Name);
#endif
@@ -357,11 +356,12 @@ public:
CBSaveThumbHelper *m_CachedThumbnail;
#if 0
AnsiString GetDataDir();
-
+#endif
void AddMem(int bytes);
bool m_TouchInterface;
bool m_ConstrainedMemory;
+#if 0
AnsiString GetDeviceType() const;
private:
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index a7bac98891..d376f3723a 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -8,6 +8,30 @@ MODULE_OBJS := \
scriptables/SXDate.o \
scriptables/SXMath.o \
scriptables/SXMemBuffer.o \
+ AdActor.o \
+ AdActorDir.o \
+ AdInventory.o \
+ AdInventoryBox.o \
+ AdItem.o \
+ AdLayer.o \
+ AdNodeState.o \
+ AdObject.o \
+ AdPath.o \
+ AdPathPoint.o \
+ AdRegion.o \
+ AdResponse.o \
+ AdResponseBox.o \
+ AdRotLevel.o \
+ AdScaleLevel.o \
+ AdScene.o \
+ AdSceneNode.o \
+ AdSceneState.o \
+ AdSentence.o \
+ AdSpriteSet.o \
+ AdTalkDef.o \
+ AdTalkHolder.o \
+ AdTalkNode.o \
+ AdWaypointGroup.o \
BActiveRect.o \
BDebugger.o \
BDynBuffer.o \
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 18:37:10 +0000