aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Ad
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/Ad')
-rw-r--r--engines/wintermute/Ad/AdGame.cpp8
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.cpp3
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.h3
-rw-r--r--engines/wintermute/Ad/AdItem.cpp6
-rw-r--r--engines/wintermute/Ad/AdResponseBox.cpp2
-rw-r--r--engines/wintermute/Ad/AdResponseBox.h2
-rw-r--r--engines/wintermute/Ad/AdScene.cpp6
-rw-r--r--engines/wintermute/Ad/AdSentence.h3
8 files changed, 18 insertions, 15 deletions
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index bf4bb41c75..69a31575cb 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -1210,7 +1210,7 @@ ERRORCODE CAdGame::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_SCENE_VIEWPORT: {
- RECT rc;
+ Common::Rect rc;
parser.scanStr((char *)params2, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
if (!_sceneViewport) _sceneViewport = new CBViewport(Game);
if (_sceneViewport) _sceneViewport->setRect(rc.left, rc.top, rc.right, rc.bottom);
@@ -1698,7 +1698,7 @@ ERRORCODE CAdGame::displayContent(bool doUpdate, bool displayAll) {
// process scripts
if (doUpdate) _scEngine->tick();
- POINT p;
+ Common::Point p;
getMousePos(&p);
_scene->update();
@@ -1900,7 +1900,7 @@ ERRORCODE CAdGame::removeSpeechDir(const char *dir) {
//////////////////////////////////////////////////////////////////////////
char *CAdGame::findSpeechFile(char *stringID) {
- char *ret = new char[MAX_PATH];
+ char *ret = new char[MAX_PATH_LENGTH];
for (int i = 0; i < _speechDirs.GetSize(); i++) {
sprintf(ret, "%s%s.ogg", _speechDirs[i], stringID);
@@ -1924,7 +1924,7 @@ char *CAdGame::findSpeechFile(char *stringID) {
//////////////////////////////////////////////////////////////////////////
bool CAdGame::validMouse() {
- POINT pos;
+ Common::Point pos;
CBPlatform::getCursorPos(&pos);
return _renderer->pointInViewport(&pos);
diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index 9cb26d8e53..3b887c4737 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -39,6 +39,7 @@
#include "engines/wintermute/UI/UIWindow.h"
#include "engines/wintermute/PlatformSDL.h"
#include "common/str.h"
+#include "common/rect.h"
namespace WinterMute {
@@ -122,7 +123,7 @@ ERRORCODE CAdInventoryBox::display() {
// display window
- RECT rect = _itemsArea;
+ Common::Rect rect = _itemsArea;
if (_window) {
CBPlatform::offsetRect(&rect, _window->_posX, _window->_posY);
_window->display();
diff --git a/engines/wintermute/Ad/AdInventoryBox.h b/engines/wintermute/Ad/AdInventoryBox.h
index 536f60130e..e3aec3a20b 100644
--- a/engines/wintermute/Ad/AdInventoryBox.h
+++ b/engines/wintermute/Ad/AdInventoryBox.h
@@ -30,6 +30,7 @@
#define WINTERMUTE_ADINVENTORYBOX_H
#include "engines/wintermute/Base/BObject.h"
+#include "common/rect.h"
namespace WinterMute {
class CUIButton;
@@ -48,7 +49,7 @@ public:
CUIButton *_closeButton;
int _spacing;
int _scrollOffset;
- RECT _itemsArea;
+ Common::Rect _itemsArea;
ERRORCODE listen(CBScriptHolder *param1, uint32 param2);
CUIWindow *_window;
CAdInventoryBox(CBGame *inGame);
diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index 3b17cfd963..e2e7374f68 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -389,9 +389,9 @@ ERRORCODE CAdItem::update() {
ERRORCODE CAdItem::display(int x, int y) {
int width = 0;
if (_currentSprite) {
- RECT rc;
- _currentSprite->GetBoundingRect(&rc, 0, 0);
- width = rc.right - rc.left;
+ Common::Rect rc;
+ _currentSprite->getBoundingRect(&rc, 0, 0);
+ width = rc.width();
}
_posX = x + width / 2;
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index 0eeadd72bc..9ab669ba14 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -397,7 +397,7 @@ ERRORCODE CAdResponseBox::saveAsText(CBDynBuffer *buffer, int indent) {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CAdResponseBox::display() {
- RECT rect = _responseArea;
+ Common::Rect rect = _responseArea;
if (_window) {
CBPlatform::offsetRect(&rect, _window->_posX, _window->_posY);
//_window->display();
diff --git a/engines/wintermute/Ad/AdResponseBox.h b/engines/wintermute/Ad/AdResponseBox.h
index de21921fde..31076c056c 100644
--- a/engines/wintermute/Ad/AdResponseBox.h
+++ b/engines/wintermute/Ad/AdResponseBox.h
@@ -74,7 +74,7 @@ public:
CUIWindow *_window;
CUIWindow *_shieldWindow;
bool _horizontal;
- RECT _responseArea;
+ Common::Rect _responseArea;
int _verticalAlign;
TTextAlign _align;
ERRORCODE loadFile(const char *filename);
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index 9362830a54..c6a3b971ed 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -621,7 +621,7 @@ ERRORCODE CAdScene::loadBuffer(byte *buffer, bool complete) {
}
int ar, ag, ab, aa;
- char camera[MAX_PATH] = "";
+ char camera[MAX_PATH_LENGTH] = "";
/* float WaypointHeight = -1.0f; */
while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
@@ -818,7 +818,7 @@ ERRORCODE CAdScene::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_VIEWPORT: {
- RECT rc;
+ Common::Rect rc;
parser.scanStr((char *)params, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
if (!_viewport) _viewport = new CBViewport(Game);
if (_viewport) _viewport->setRect(rc.left, rc.top, rc.right, rc.bottom, true);
@@ -1988,7 +1988,7 @@ ERRORCODE CAdScene::saveAsText(CBDynBuffer *buffer, int indent) {
// viewport
if (_viewport) {
- RECT *rc = _viewport->getRect();
+ Common::Rect *rc = _viewport->getRect();
buffer->putTextIndent(indent + 2, "VIEWPORT { %d, %d, %d, %d }\n", rc->left, rc->top, rc->right, rc->bottom);
}
diff --git a/engines/wintermute/Ad/AdSentence.h b/engines/wintermute/Ad/AdSentence.h
index a8b08433c1..8ec0ca55e4 100644
--- a/engines/wintermute/Ad/AdSentence.h
+++ b/engines/wintermute/Ad/AdSentence.h
@@ -33,6 +33,7 @@
#include "engines/wintermute/Base/BBase.h"
#include "engines/wintermute/persistent.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
+#include "common/rect.h"
namespace WinterMute {
class CAdTalkDef;
@@ -55,7 +56,7 @@ public:
TTextAlign _align;
ERRORCODE display();
int _width;
- POINT _pos;
+ Common::Point _pos;
CBFont *_font;
char *getNextStance();
char *getCurrentStance();
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-21 23:26:26 +0000