[Scummvm-git-logs] scummvm master -> 5cf6ba2c89c8864249dd9c3c46763003bce19d8d
bluegr
noreply at scummvm.org
Tue Mar 29 22:01:21 UTC 2022
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a328e7c4e1 CHEWY: Rename SplitStringInit fields
5cf6ba2c89 CHEWY: Get rid of the hasSpeech flag
Commit: a328e7c4e19f8e63b65d60ac1859414fc4f2682d
https://github.com/scummvm/scummvm/commit/a328e7c4e19f8e63b65d60ac1859414fc4f2682d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-03-30T01:00:53+03:00
Commit Message:
CHEWY: Rename SplitStringInit fields
Changed paths:
engines/chewy/atds.cpp
engines/chewy/atds.h
diff --git a/engines/chewy/atds.cpp b/engines/chewy/atds.cpp
index 28ff29649f5..51edd7de958 100644
--- a/engines/chewy/atds.cpp
+++ b/engines/chewy/atds.cpp
@@ -174,7 +174,7 @@ void Atdsys::updateSoundSettings() {
}
int16 Atdsys::get_delay(int16 txt_len) {
- int16 z_len = (_ssi->_width / _ssi->Fvorx) + 1;
+ int16 z_len = (_ssi->_width / _ssi->fontWidth) + 1;
int16 maxLen = z_len * _ssi->_lines;
if (txt_len > maxLen)
txt_len = maxLen;
@@ -188,7 +188,7 @@ SplitStringRet *Atdsys::split_string(SplitStringInit *ssi_) {
_ssret._next = false;
_ssret._strPtr = _splitPtr;
_ssret._x = _splitX;
- int16 zeichen_anz = (ssi_->_width / ssi_->Fvorx) + 1;
+ int16 zeichen_anz = (ssi_->_width / ssi_->fontWidth) + 1;
memset(_splitPtr, 0, sizeof(char *) * MAX_STR_SPLIT);
calc_txt_win(ssi_);
char *str_adr = ssi_->_str;
@@ -218,7 +218,7 @@ SplitStringRet *Atdsys::split_string(SplitStringInit *ssi_) {
_splitPtr[_ssret._nr] = start_adr;
start_adr[tmp_count] = 0;
if (ssi_->_mode == SPLIT_CENTER)
- _splitX[_ssret._nr] = ssi_->_x + ((ssi_->_width - (strlen(start_adr) * ssi_->Fvorx)) >> 1);
+ _splitX[_ssret._nr] = ssi_->_x + ((ssi_->_width - (strlen(start_adr) * ssi_->fontWidth)) >> 1);
else
_splitX[_ssret._nr] = ssi_->_x;
++_ssret._nr;
@@ -265,7 +265,7 @@ SplitStringRet *Atdsys::split_string(SplitStringInit *ssi_) {
_splitPtr[_ssret._nr] = start_adr;
start_adr[tmp_count] = 0;
if (ssi_->_mode == SPLIT_CENTER)
- _splitX[_ssret._nr] = ssi_->_x + ((ssi_->_width - (strlen(start_adr) * ssi_->Fvorx)) >> 1);
+ _splitX[_ssret._nr] = ssi_->_x + ((ssi_->_width - (strlen(start_adr) * ssi_->fontWidth)) >> 1);
else
_splitX[_ssret._nr] = ssi_->_x;
++_ssret._nr;
@@ -300,7 +300,7 @@ SplitStringRet *Atdsys::split_string(SplitStringInit *ssi_) {
}
}
if (_ssret._nr <= ssi_->_lines)
- _ssret._y = ssi_->_y + (ssi_->_lines - _ssret._nr) * ssi_->FHoehe;
+ _ssret._y = ssi_->_y + (ssi_->_lines - _ssret._nr) * ssi_->fontHeight;
else
_ssret._y = ssi_->_y;
@@ -323,12 +323,12 @@ void Atdsys::calc_txt_win(SplitStringInit *ssi_) {
else
ssi_->_x -= (ssi_->_width >> 1);
- if (ssi_->_y - (ssi_->_lines * ssi_->FHoehe) < 2) {
+ if (ssi_->_y - (ssi_->_lines * ssi_->fontHeight) < 2) {
ssi_->_y = 2;
- } else if (ssi_->_y + (ssi_->_lines * ssi_->FHoehe) > (SCREEN_HEIGHT - 2))
- ssi_->_y = (SCREEN_HEIGHT - 2) - (ssi_->_lines * ssi_->FHoehe);
+ } else if (ssi_->_y + (ssi_->_lines * ssi_->fontHeight) > (SCREEN_HEIGHT - 2))
+ ssi_->_y = (SCREEN_HEIGHT - 2) - (ssi_->_lines * ssi_->fontHeight);
else {
- ssi_->_y -= (ssi_->_lines * ssi_->FHoehe);
+ ssi_->_y -= (ssi_->_lines * ssi_->fontHeight);
}
}
@@ -570,8 +570,8 @@ void Atdsys::print_ats(int16 x, int16 y, int16 scrX, int16 scrY) {
char *tmp_ptr = _atsv._ptr;
SplitStringInit *_atsSsi = &_ssi[0];
_atsSsi->_str = tmp_ptr;
- _atsSsi->Fvorx = _G(fontMgr)->getFont()->getDataWidth();
- _atsSsi->FHoehe = _G(fontMgr)->getFont()->getDataHeight();
+ _atsSsi->fontWidth = _G(fontMgr)->getFont()->getDataWidth();
+ _atsSsi->fontHeight = _G(fontMgr)->getFont()->getDataHeight();
_atsSsi->_x = x - scrX;
_atsSsi->_y = y - scrY;
char *start_ptr = tmp_ptr;
@@ -580,19 +580,19 @@ void Atdsys::print_ats(int16 x, int16 y, int16 scrX, int16 scrY) {
for (int16 i = 0; i < _ssr->_nr; i++) {
_G(out)->printxy(_ssr->_x[i],
- _ssr->_y + (i * _atsSsi->FHoehe) + 1,
+ _ssr->_y + (i * _atsSsi->fontHeight) + 1,
0, 300, 0, _ssr->_strPtr[i]);
_G(out)->printxy(_ssr->_x[i],
- _ssr->_y + (i * _atsSsi->FHoehe) - 1,
+ _ssr->_y + (i * _atsSsi->fontHeight) - 1,
0, 300, 0, _ssr->_strPtr[i]);
_G(out)->printxy(_ssr->_x[i] + 1,
- _ssr->_y + (i * _atsSsi->FHoehe),
+ _ssr->_y + (i * _atsSsi->fontHeight),
0, 300, 0, _ssr->_strPtr[i]);
_G(out)->printxy(_ssr->_x[i] - 1,
- _ssr->_y + (i * _atsSsi->FHoehe),
+ _ssr->_y + (i * _atsSsi->fontHeight),
0, 300, 0, _ssr->_strPtr[i]);
_G(out)->printxy(_ssr->_x[i],
- _ssr->_y + (i * _atsSsi->FHoehe),
+ _ssr->_y + (i * _atsSsi->fontHeight),
_atsv._color,
300, 0, _ssr->_strPtr[i]);
tmp_ptr += strlen(_ssr->_strPtr[i]) + 1;
@@ -932,8 +932,8 @@ void Atdsys::print_aad(int16 scrX, int16 scrY) {
if (_aadv._person[_aadv._strHeader->_akPerson]._y != -1) {
_ssi[_aadv._strHeader->_akPerson]._y = _aadv._person[_aadv._strHeader->_akPerson]._y - scrY;
}
- _ssi[_aadv._strHeader->_akPerson].Fvorx = _G(fontMgr)->getFont()->getDataWidth();
- _ssi[_aadv._strHeader->_akPerson].FHoehe = _G(fontMgr)->getFont()->getDataHeight();
+ _ssi[_aadv._strHeader->_akPerson].fontWidth = _G(fontMgr)->getFont()->getDataWidth();
+ _ssi[_aadv._strHeader->_akPerson].fontHeight = _G(fontMgr)->getFont()->getDataHeight();
char *start_ptr = tmp_ptr;
int16 txt_len;
aad_get_zeilen(start_ptr, &txt_len);
@@ -945,19 +945,19 @@ void Atdsys::print_aad(int16 scrX, int16 scrY) {
(_aadv._strHeader->_vocNr - ATDS_VOC_OFFSET) == -1) {
for (int16 i = 0; i < _ssr->_nr; i++) {
_G(out)->printxy(_ssr->_x[i] + 1,
- _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].FHoehe),
+ _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].fontHeight),
0, 300, 0, _ssr->_strPtr[i]);
_G(out)->printxy(_ssr->_x[i] - 1,
- _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].FHoehe),
+ _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].fontHeight),
0, 300, 0, _ssr->_strPtr[i]);
_G(out)->printxy(_ssr->_x[i],
- _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].FHoehe) + 1,
+ _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].fontHeight) + 1,
0, 300, 0, _ssr->_strPtr[i]);
_G(out)->printxy(_ssr->_x[i],
- _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].FHoehe) - 1,
+ _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].fontHeight) - 1,
0, 300, 0, _ssr->_strPtr[i]);
_G(out)->printxy(_ssr->_x[i],
- _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].FHoehe),
+ _ssr->_y + (i * _ssi[_aadv._strHeader->_akPerson].fontHeight),
_aadv._person[_aadv._strHeader->_akPerson]._color,
300, 0, _ssr->_strPtr[i]);
tmp_ptr += strlen(_ssr->_strPtr[i]) + 1;
diff --git a/engines/chewy/atds.h b/engines/chewy/atds.h
index d29a9f04b81..bb90028a6ea 100644
--- a/engines/chewy/atds.h
+++ b/engines/chewy/atds.h
@@ -241,8 +241,8 @@ struct SplitStringInit {
int16 _lines;
int16 _mode;
- int16 Fvorx;
- int16 FHoehe;
+ int16 fontWidth;
+ int16 fontHeight;
};
class Atdsys {
Commit: 5cf6ba2c89c8864249dd9c3c46763003bce19d8d
https://github.com/scummvm/scummvm/commit/5cf6ba2c89c8864249dd9c3c46763003bce19d8d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-03-30T01:00:53+03:00
Commit Message:
CHEWY: Get rid of the hasSpeech flag
Changed paths:
engines/chewy/atds.cpp
engines/chewy/atds.h
engines/chewy/dialogs/options.cpp
engines/chewy/inits.cpp
diff --git a/engines/chewy/atds.cpp b/engines/chewy/atds.cpp
index 51edd7de958..58ff76d00f6 100644
--- a/engines/chewy/atds.cpp
+++ b/engines/chewy/atds.cpp
@@ -161,13 +161,8 @@ void Atdsys::set_string_end_func
_atdsv.aad_str = strFunc;
}
-void Atdsys::setHasSpeech(bool hasSpeech) {
- _hasSpeech = hasSpeech;
- updateSoundSettings();
-}
-
void Atdsys::updateSoundSettings() {
- if (!_hasSpeech)
+ if (!g_engine->_sound->speechEnabled())
_atdsv._display = DISPLAY_TXT;
else
_atdsv._display = g_engine->_sound->getSpeechSubtitlesMode();
diff --git a/engines/chewy/atds.h b/engines/chewy/atds.h
index bb90028a6ea..2ee18088de9 100644
--- a/engines/chewy/atds.h
+++ b/engines/chewy/atds.h
@@ -251,7 +251,6 @@ public:
~Atdsys();
void set_delay(int16 *delay, int16 silent);
- void setHasSpeech(bool hasSpeech);
void updateSoundSettings();
void set_split_win(int16 nr, int16 x, int16 y);
SplitStringRet *split_string(SplitStringInit *ssi);
@@ -354,7 +353,6 @@ private:
int16 _invBlockNr;
char *_invUseMem = nullptr;
int16 _tmpDelay;
- bool _hasSpeech = false;
int16 _mousePush = 0;
int _printDelayCount1 = 0;
DialogResource *_dialogResource;
diff --git a/engines/chewy/dialogs/options.cpp b/engines/chewy/dialogs/options.cpp
index db6025476a6..6801c6ecbc9 100644
--- a/engines/chewy/dialogs/options.cpp
+++ b/engines/chewy/dialogs/options.cpp
@@ -173,13 +173,13 @@ void Options::execute(TafInfo *ti) {
case 4:
if (g_engine->_sound->subtitlesEnabled()) {
g_engine->_sound->toggleSubtitles(false);
- _G(atds)->setHasSpeech(true);
g_engine->_sound->toggleSpeech(true);
} else {
g_engine->_sound->toggleSubtitles(true);
- _G(atds)->setHasSpeech(false);
g_engine->_sound->toggleSpeech(false);
}
+
+ _G(atds)->updateSoundSettings();
break;
case 5:
if (g_engine->_sound->musicEnabled()) {
diff --git a/engines/chewy/inits.cpp b/engines/chewy/inits.cpp
index f9226cce487..a866900648b 100644
--- a/engines/chewy/inits.cpp
+++ b/engines/chewy/inits.cpp
@@ -284,7 +284,7 @@ void sound_init() {
_G(gameState).SoundVol = 63;
g_engine->_sound->setMusicVolume(_G(gameState).MusicVol * Audio::Mixer::kMaxChannelVolume / 120);
g_engine->_sound->setSoundVolume(_G(gameState).SoundVol * Audio::Mixer::kMaxChannelVolume / 120);
- _G(atds)->setHasSpeech(true);
+ _G(atds)->updateSoundSettings();
}
void show_intro() {
More information about the Scummvm-git-logs
mailing list