[Scummvm-git-logs] scummvm master -> ad7060e5e315dce8040078dd16a1d5b29555bd32
aquadran
noreply at scummvm.org
Sat Aug 16 11:49:35 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
ad7060e5e3 WINTERMUTE: Small sync with original code
Commit: ad7060e5e315dce8040078dd16a1d5b29555bd32
https://github.com/scummvm/scummvm/commit/ad7060e5e315dce8040078dd16a1d5b29555bd32
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-08-16T13:49:30+02:00
Commit Message:
WINTERMUTE: Small sync with original code
Changed paths:
engines/wintermute/ad/ad_actor.cpp
engines/wintermute/ad/ad_actor_3dx.cpp
engines/wintermute/ad/ad_actor_3dx.h
engines/wintermute/ad/ad_entity.cpp
engines/wintermute/ad/ad_entity.h
engines/wintermute/ad/ad_scene.cpp
diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index c678cf169af..7d257b48fcc 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -1016,10 +1016,10 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
return STATUS_OK;
}
AdEntity *ent = (AdEntity *)obj;
- if (ent->getWalkToX() == 0 && ent->getWalkToY() == 0) {
+ if (ent->_walkToX == 0 && ent->_walkToY == 0) {
goTo(ent->_posX, ent->_posY);
} else {
- goTo(ent->getWalkToX(), ent->getWalkToY(), ent->getWalkToDir());
+ goTo(ent->_walkToX, ent->_walkToY, ent->_walkToDir);
}
if (strcmp(name, "GoToObjectAsync") != 0) {
script->waitForExclusive(this);
diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index a8a5979068e..aabeb659043 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -1606,16 +1606,16 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
bool goToNeeded = true;
- if (ent->getWalkToX() == 0 && ent->getWalkToY() == 0) {
+ if (ent->_walkToX == 0 && ent->_walkToY == 0) {
goToNeeded = isGoToNeeded(ent->_posX, ent->_posY);
} else {
- goToNeeded = isGoToNeeded(ent->getWalkToX(), ent->getWalkToY());
+ goToNeeded = isGoToNeeded(ent->_walkToX, ent->_walkToY);
}
if (!goToNeeded) {
// no goto needed, but we still want to turn
- if (ent->getWalkToX() != 0 || ent->getWalkToY() != 0) {
- turnTo(dirToAngle(ent->getWalkToDir()));
+ if (ent->_walkToX != 0 || ent->_walkToY != 0) {
+ turnTo(dirToAngle(ent->_walkToDir));
if (strcmp(name, "GoToObjectAsync") != 0) {
script->waitForExclusive(this);
}
@@ -1633,10 +1633,10 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
}
if (adGame->_scene->_2DPathfinding) {
- if (ent->getWalkToX() == 0 && ent->getWalkToY() == 0) {
+ if (ent->_walkToX== 0 && ent->_walkToY== 0) {
goTo2D(ent->_posX, ent->_posY);
} else {
- goTo2D(ent->getWalkToX(), ent->getWalkToY(), dirToAngle(ent->getWalkToDir()));
+ goTo2D(ent->_walkToX, ent->_walkToY, dirToAngle(ent->_walkToDir));
}
if (strcmp(name, "GoToObjectAsync") != 0) {
@@ -1646,11 +1646,11 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
if (adGame->_scene->_geom) {
DXVector3 pos;
- if (adGame->_scene->_geom->convert2Dto3DTolerant(ent->getWalkToX(), ent->getWalkToY(), &pos)) {
- if (ent->getWalkToX() == 0 && ent->getWalkToY() == 0) {
+ if (adGame->_scene->_geom->convert2Dto3DTolerant(ent->_walkToX, ent->_walkToY, &pos)) {
+ if (ent->_walkToX == 0 && ent->_walkToY == 0) {
goTo3D(pos);
} else {
- goTo3D(pos, dirToAngle(ent->getWalkToDir()));
+ goTo3D(pos, dirToAngle(ent->_walkToDir));
}
if (strcmp(name, "GoToObjectAsync") != 0) {
@@ -2434,7 +2434,7 @@ bool AdActor3DX::unloadAnimation(const char *animName) {
}
//////////////////////////////////////////////////////////////////////////
-bool AdActor3DX::isGoToNeeded(int x, int y) {
+bool AdActor3DX::isGoToNeeded(int32 x, int32 y) {
if (ABS(x - _posX) <= _goToTolerance && ABS(y - _posY) <= _goToTolerance) {
return false;
} else {
diff --git a/engines/wintermute/ad/ad_actor_3dx.h b/engines/wintermute/ad/ad_actor_3dx.h
index b953a05ab64..7071b60532e 100644
--- a/engines/wintermute/ad/ad_actor_3dx.h
+++ b/engines/wintermute/ad/ad_actor_3dx.h
@@ -128,7 +128,7 @@ private:
bool mergeAnimations(const char *filename);
bool mergeAnimations2(const char *filename);
bool unloadAnimation(const char *animName);
- bool isGoToNeeded(int x, int y);
+ bool isGoToNeeded(int32 x, int32 y);
};
} // namespace Wintermute
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index a0feace5c99..ff9c47eb841 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -89,22 +89,6 @@ AdEntity::~AdEntity() {
_item = nullptr;
}
-int32 AdEntity::getWalkToX() const {
- return _walkToX;
-}
-
-int32 AdEntity::getWalkToY() const {
- return _walkToY;
-}
-
-TDirection AdEntity::getWalkToDir() const {
- return _walkToDir;
-}
-
-const char *AdEntity::getItemName() const {
- return _item;
-}
-
#ifdef ENABLE_FOXTAIL
int32 AdEntity::getHintX() const {
return _hintX;
diff --git a/engines/wintermute/ad/ad_entity.h b/engines/wintermute/ad/ad_entity.h
index b9770ee4a29..b7148dcffd2 100644
--- a/engines/wintermute/ad/ad_entity.h
+++ b/engines/wintermute/ad/ad_entity.h
@@ -54,11 +54,6 @@ public:
bool loadBuffer(char *buffer, bool complete = true);
TEntityType _subtype;
- int32 getWalkToX() const;
- int32 getWalkToY() const;
- TDirection getWalkToDir() const;
- const char* getItemName() const;
-
#ifdef ENABLE_FOXTAIL
int32 getHintX() const;
int32 getHintY() const;
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 37c4369cdde..328d55e1d1b 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -3551,7 +3551,7 @@ bool AdScene::handleItemAssociations(const char *itemName, bool show) {
if (layer->_nodes[j]->_type == OBJECT_ENTITY) {
AdEntity *ent = layer->_nodes[j]->_entity;
- if (ent->getItemName() && strcmp(ent->getItemName(), itemName) == 0) {
+ if (ent->_item && strcmp(ent->_item, itemName) == 0) {
ent->_active = show;
}
}
@@ -3561,7 +3561,7 @@ bool AdScene::handleItemAssociations(const char *itemName, bool show) {
for (int32 i = 0; i < _objects.getSize(); i++) {
if (_objects[i]->_type == OBJECT_ENTITY) {
AdEntity *ent = (AdEntity *)_objects[i];
- if (ent->getItemName() && strcmp(ent->getItemName(), itemName) == 0) {
+ if (ent->_item && strcmp(ent->_item, itemName) == 0) {
ent->_active = show;
}
}
@@ -3753,7 +3753,7 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray<AdObject *> &objects,
#ifdef ENABLE_WME3D
//////////////////////////////////////////////////////////////////////////
-void AdScene::setMaxShadowType(Wintermute::TShadowType shadowType) {
+void AdScene::setMaxShadowType(TShadowType shadowType) {
if (shadowType > SHADOW_STENCIL) {
shadowType = SHADOW_STENCIL;
}
More information about the Scummvm-git-logs
mailing list