[Scummvm-git-logs] scummvm master -> 6f6de0289bf0e9d57950a63fe113a4e7b602d5c4
aquadran
noreply at scummvm.org
Wed Aug 13 12:37:08 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:
6f6de0289b WINTERMUTE: Synced with original code
Commit: 6f6de0289bf0e9d57950a63fe113a4e7b602d5c4
https://github.com/scummvm/scummvm/commit/6f6de0289bf0e9d57950a63fe113a4e7b602d5c4
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2025-08-13T14:37:02+02:00
Commit Message:
WINTERMUTE: Synced with original code
Changed paths:
engines/wintermute/ad/ad_entity.cpp
engines/wintermute/ad/ad_entity.h
engines/wintermute/ad/ad_response_box.cpp
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index f819df81b89..a0feace5c99 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -616,6 +616,21 @@ bool AdEntity::display() {
_partEmitter->display(_region);
}
+ // accessibility
+ /*if (Game->m_AccessMgr->GetActiveObject() == this) {
+ float ScaleX, ScaleY;
+ GetScale(&ScaleX, &ScaleY);
+
+ RECT rc;
+ SetRectEmpty(&rc);
+ if (m_CurrentSprite) {
+ m_CurrentSprite->GetBoundingRect(&rc, m_PosX - Game->m_OffsetX, m_PosY - Game->m_OffsetY, ScaleX, ScaleY);
+ } else if (m_Region) {
+ m_Region->GetBoundingRect(&rc);
+ OffsetRect(&rc, -Game->m_OffsetX, -Game->m_OffsetY);
+ }
+ Game->m_AccessMgr->SetHintRect(&rc);
+ }*/
}
return STATUS_OK;
}
@@ -1182,7 +1197,6 @@ bool AdEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "SOUND_VOLUME=%d\n", _sFXVolume);
}
-
if (RGBCOLGetR(_alphaColor) != 0 || RGBCOLGetG(_alphaColor) != 0 || RGBCOLGetB(_alphaColor) != 0) {
buffer->putTextIndent(indent + 2, "ALPHA_COLOR { %d,%d,%d }\n", RGBCOLGetR(_alphaColor), RGBCOLGetG(_alphaColor), RGBCOLGetB(_alphaColor));
}
diff --git a/engines/wintermute/ad/ad_entity.h b/engines/wintermute/ad/ad_entity.h
index 40d9f4fcc3e..b9770ee4a29 100644
--- a/engines/wintermute/ad/ad_entity.h
+++ b/engines/wintermute/ad/ad_entity.h
@@ -36,7 +36,11 @@ class AdEntity : public AdTalkHolder {
public:
VideoTheoraPlayer *_theora;
bool setSprite(const char *filename);
+ int32 _walkToX;
+ int32 _walkToY;
+ TDirection _walkToDir;
void setItem(const char *itemName);
+ char *_item;
DECLARE_PERSISTENT(AdEntity, AdTalkHolder)
void updatePosition();
int32 getHeight() override;
@@ -48,6 +52,7 @@ public:
~AdEntity() override;
bool loadFile(const char *filename);
bool loadBuffer(char *buffer, bool complete = true);
+ TEntityType _subtype;
int32 getWalkToX() const;
int32 getWalkToY() const;
@@ -66,11 +71,6 @@ public:
const char *scToString() override;
Common::String debuggerToString() const override;
private:
- int32 _walkToX;
- int32 _walkToY;
- TDirection _walkToDir;
- char *_item;
- TEntityType _subtype;
#ifdef ENABLE_FOXTAIL
int32 _hintX;
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index c9629d34b24..5caae533512 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -137,8 +137,7 @@ bool AdResponseBox::createButtons() {
UIButton *btn = new UIButton(_gameRef);
if (btn) {
btn->_parent = _window;
- btn->_sharedFonts = true;
- btn->_sharedImages = true;
+ btn->_sharedFonts = btn->_sharedImages = true;
btn->_sharedCursors = true;
// iconic
if (_responses[i]->_icon) {
@@ -160,11 +159,7 @@ bool AdResponseBox::createButtons() {
// textual
else {
btn->setText(_responses[i]->_text);
- if (_font == nullptr) {
- btn->_font = _gameRef->_systemFont;
- } else {
- btn->_font = _font;
- }
+ btn->_font = (_font == nullptr) ? _gameRef->_systemFont : _font;
btn->_fontHover = (_fontHover == nullptr) ? _gameRef->_systemFont : _fontHover;
btn->_fontPress = btn->_fontHover;
btn->_align = _align;
@@ -173,12 +168,9 @@ bool AdResponseBox::createButtons() {
btn->_font = _responses[i]->_font;
}
- int width = _responseArea.right - _responseArea.left;
-
- if (width <= 0) {
+ btn->_width = _responseArea.right - _responseArea.left;
+ if (btn->_width <= 0) {
btn->_width = _gameRef->_renderer->getWidth();
- } else {
- btn->_width = width;
}
}
@@ -200,9 +192,9 @@ bool AdResponseBox::createButtons() {
btn->_visible = false;
_respButtons.add(btn);
- if (_responseArea.bottom - _responseArea.top < btn->getHeight()) {
+ if (_responseArea.bottom - _responseArea.top < btn->_height) {
_gameRef->LOG(0, "Warning: Response '%s' is too high to be displayed within response box. Correcting.", _responses[i]->_text);
- _responseArea.bottom += (btn->getHeight() - (_responseArea.bottom - _responseArea.top));
+ _responseArea.bottom += (btn->_height - (_responseArea.bottom - _responseArea.top));
}
}
}
@@ -470,7 +462,7 @@ bool AdResponseBox::display() {
if (!_horizontal) {
int32 totalHeight = 0;
for (i = 0; i < _respButtons.getSize(); i++) {
- totalHeight += (_respButtons[i]->getHeight() + _spacing);
+ totalHeight += (_respButtons[i]->_height + _spacing);
}
totalHeight -= _spacing;
@@ -513,8 +505,7 @@ bool AdResponseBox::display() {
}
#endif
- if ((_horizontal && xxx + _respButtons[i]->_width > rect.right)
- || (!_horizontal && yyy + _respButtons[i]->getHeight() > rect.bottom)) {
+ if ((_horizontal && xxx + _respButtons[i]->_width > rect.right) || (!_horizontal && yyy + _respButtons[i]->_height > rect.bottom)) {
scrollNeeded = true;
_respButtons[i]->_visible = false;
More information about the Scummvm-git-logs
mailing list