[Scummvm-git-logs] scummvm master -> 7fde53d5f719ae85cc2f3496b61002ce88f9673d
sev-
sev at scummvm.org
Sat May 1 23:11:56 UTC 2021
This automated email contains information about 9 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
98e698d661 PINK: Recode texts for Danish version
5e6e9bf74b GRAPHICS: MACGUI: Expose MacWindowManager palette
ed9c2f97ca GRAPHICS: Implemented debug output for Surface
6e17562492 GUI: MACGUI: Make MacTextWindow working with plain fonts
078eaf3079 PINK: Switch MacTexWindow to windows font too
c652741e16 PINK: Fix encoding for Polish
c7517e2eac PINK: Fixes for Finnish version
b3cf5c0383 PINK: Specify encoding for the rest of the game languages
7fde53d5f7 BASE: Remove redundant warning. It will be triggered at the end of the function
Commit: 98e698d6612d0877e80c758ca13215f8ef013b9a
https://github.com/scummvm/scummvm/commit/98e698d6612d0877e80c758ca13215f8ef013b9a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-02T01:03:01+02:00
Commit Message:
PINK: Recode texts for Danish version
Changed paths:
engines/pink/objects/actions/action_text.cpp
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index f4d5d433e9..d4b3c04665 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -91,6 +91,10 @@ void ActionText::start() {
_text = Common::String(str).decode(Common::kWindows1251);
break;
+ case Common::DA_DAN:
+ _text = Common::String(str).decode(Common::kWindows1252);
+ break;
+
case Common::HE_ISR:
_text = Common::String(str).decode(Common::kWindows1255);
if (!_centered) {
Commit: 5e6e9bf74bf96565f72966f2e004a200b1a6c70c
https://github.com/scummvm/scummvm/commit/5e6e9bf74bf96565f72966f2e004a200b1a6c70c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-02T01:03:01+02:00
Commit Message:
GRAPHICS: MACGUI: Expose MacWindowManager palette
Changed paths:
graphics/macgui/macwindowmanager.h
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index 0ed4786b45..e0d13feaef 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -300,6 +300,9 @@ public:
uint findBestColor(byte cr, byte cg, byte cb);
void decomposeColor(uint32 color, byte &r, byte &g, byte &b);
+ const byte *getPalette() { return _palette; }
+ uint getPaletteSize() { return _paletteSize; }
+
void renderZoomBox(bool redraw = false);
void addZoomBox(ZoomBox *box);
Commit: ed9c2f97ca5f97b1fc997912dfa96c1e7ae5d27c
https://github.com/scummvm/scummvm/commit/ed9c2f97ca5f97b1fc997912dfa96c1e7ae5d27c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-02T01:03:01+02:00
Commit Message:
GRAPHICS: Implemented debug output for Surface
Changed paths:
graphics/surface.cpp
graphics/surface.h
diff --git a/graphics/surface.cpp b/graphics/surface.cpp
index 2cd9343acd..4345949d7c 100644
--- a/graphics/surface.cpp
+++ b/graphics/surface.cpp
@@ -550,6 +550,96 @@ Graphics::Surface *Surface::convertTo(const PixelFormat &dstFormat, const byte *
return surface;
}
+void Surface::debugPrint(int debuglevel, int width, int height, int x, int y, int scale, int maxwidth, const byte *palette) const {
+ // 012 3456789abcdef
+ const char *gradient = " .:\';+*<?F7RQ&%#";
+
+ if (width <= 0) width = w;
+ if (height <= 0) height = h;
+ if (x < 0) x = 0;
+ if (y < 0) y = 0;
+
+ maxwidth -= 2; // Compensate for the frame
+ if (maxwidth < 0) maxwidth = 80;
+
+ if (scale < 1) {
+ scale = MAX(1, (width + maxwidth - 1) / maxwidth);
+ }
+
+ x = MIN<int>(x, w);
+ y = MIN<int>(y, h);
+
+ int tox = MIN<int>(x + width, w);
+ int toy = MIN<int>(y + height, h);
+
+ debug(debuglevel, "Surface: %d x %d, bpp: %d, format: %s, address: %p", w, h, format.bytesPerPixel, format.toString().c_str(), (void *)this);
+ debug(debuglevel, "displaying: %d x %d @ %d,%d, scale: %d", width, height, x, y, scale);
+ debugN(debuglevel, "+");
+ for (int xx = x; xx < tox; xx += scale)
+ debugN(debuglevel, "-");
+ debug(debuglevel, "+");
+
+ for (int yy = y; yy < toy; yy += scale) {
+ debugN(debuglevel, "|");
+ for (int xx = x; xx < tox; xx += scale) {
+ double grayscale = 0.0;
+ int pixelcount = 0;
+
+ for (int ys = 0; ys < scale && yy + ys < h; ys++) {
+ const byte *srcRow = (const byte *)getBasePtr(xx, yy + ys);
+
+ for (int xs = 0; xs < scale && xx + xs < w; xs++) {
+ byte r, g, b, a;
+ uint32 color;
+
+ switch (format.bytesPerPixel) {
+ case 1: {
+ byte index = *srcRow;
+
+ if (palette) {
+ r = palette[index * 3];
+ g = palette[index * 3 + 1];
+ b = palette[index * 3 + 2];
+ } else {
+ r = g = b = index;
+ }
+
+ a = 0xff;
+ }
+ break;
+ case 2:
+ color = READ_UINT16(srcRow);
+ break;
+ case 3:
+ color = READ_UINT24(srcRow);
+ break;
+ case 4:
+ color = READ_UINT32(srcRow);
+ break;
+ default:
+ error("Surface::debugPrint: Unsupported bpp: %d", format.bytesPerPixel);
+ }
+
+ if (format.bytesPerPixel > 1)
+ format.colorToARGB(color, a, r, g, b);
+
+ grayscale += (0.29 * r + 0.58 * g + 0.11 * b) / 3.0;
+ pixelcount++;
+
+ srcRow += format.bytesPerPixel;
+ }
+ }
+
+ debugN(debuglevel, "%c", gradient[(int)(grayscale / pixelcount / 16)]);
+ }
+ debug(debuglevel, "|");
+ }
+ debugN(debuglevel, "+");
+ for (int xx = x; xx < tox; xx += scale)
+ debugN(debuglevel, "-");
+ debug(debuglevel, "+");
+}
+
FloodFill::FloodFill(Graphics::Surface *surface, uint32 oldColor, uint32 fillColor, bool maskMode) {
_surface = surface;
_oldColor = oldColor;
diff --git a/graphics/surface.h b/graphics/surface.h
index 152bc0ff1c..810296bcc7 100644
--- a/graphics/surface.h
+++ b/graphics/surface.h
@@ -424,6 +424,21 @@ public:
*/
Graphics::Surface *rotoscale(const TransformStruct &transform, bool filtering = false) const;
+ /**
+ * Print surface content on console in pseudographics
+ *
+ * @param debuglevel debug level to print at, default is 0.
+ * @param width width of the printed area in pixels. Default is 0 which is whole surface.
+ * @param height height of the printed area in pixels. Default is 0 which is whole surface.
+ * @param x horizontal offset to the print area. Default is 0.
+ * @param y vertical offset to the print area. Default is 0.
+ * @param scale number of pixels per single character. Default is -1, fit whole surface to maxwidth
+ * @param maxwidth horizontal size of the print out in characters. Default is 160. Note that 2 characters
+ * are taken by the frame
+ * @param palette Ëšpalette to use for 1bpp pixels. If omitted, we assume grayscale palette
+ *
+ */
+ void debugPrint(int debuglevel = 0, int width = 0, int height = 0, int x = 0, int y = 0, int scale = -1, int maxwidth = 160, const byte *palette = NULL) const;
};
/**
Commit: 6e17562492410c67266af4f43247aeb4330dac08
https://github.com/scummvm/scummvm/commit/6e17562492410c67266af4f43247aeb4330dac08
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-02T01:03:02+02:00
Commit Message:
GUI: MACGUI: Make MacTextWindow working with plain fonts
Changed paths:
graphics/macgui/mactext.cpp
graphics/macgui/mactext.h
graphics/macgui/mactextwindow.cpp
graphics/macgui/mactextwindow.h
graphics/macgui/macwindowmanager.cpp
graphics/macgui/macwindowmanager.h
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index d0a0a4d11d..7af3b7f580 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -267,6 +267,15 @@ MacText::~MacText() {
}
void MacText::setMaxWidth(int maxWidth) {
+ if (maxWidth == _maxWidth)
+ return;
+
+ if (!_str.empty())
+ warning("TODO: MacText::setMaxWidth() is incorrect.");
+
+ // It does not take into account the edited string
+ // Actually, it should reshuffle all paragraphs
+
_maxWidth = maxWidth;
_textLines.clear();
@@ -664,9 +673,10 @@ void MacText::render(int from, int to) {
// TODO: _textMaxWidth, when -1, was not rendering ANY text.
for (uint j = 0; j < _textLines[i].chunks.size(); j++) {
- debug(9, "MacText::render: line %d[%d] h:%d at %d,%d (%s) fontid: %d on %dx%d, color: %d",
- i, j, xOffset, _textLines[i].y, _textLines[i].height, _textLines[i].chunks[j].text.encode().c_str(),
- _textLines[i].chunks[j].fontId, _surface->w, _surface->h, _textLines[i].chunks[j].fgcolor);
+ debug(9, "MacText::render: line %d[%d] h:%d at %d,%d (%s) fontid: %d on %dx%d, fgcolor: %d bgcolor: %d, font: %p",
+ i, j, _textLines[i].height, xOffset, _textLines[i].y, _textLines[i].chunks[j].text.encode().c_str(),
+ _textLines[i].chunks[j].fontId, _surface->w, _surface->h, _textLines[i].chunks[j].fgcolor, _bgcolor,
+ (void *)_textLines[i].chunks[j].getFont());
if (_textLines[i].chunks[j].text.empty())
continue;
@@ -897,6 +907,33 @@ void MacText::appendText(const Common::U32String &str, int fontId, int fontSize,
_str += strWithFont;
}
+ appendText_(strWithFont, oldLen);
+}
+
+void MacText::appendText(const Common::U32String &str, const Font *font, uint16 r, uint16 g, uint16 b, bool skipAdd) {
+ uint oldLen = _textLines.size();
+
+ MacFontRun fontRun = MacFontRun(_wm, font, 0, font->getFontHeight(), r, g, b);
+
+ _currentFormatting = fontRun;
+
+ // we check _str here, if _str is empty but _textLines is not empty, and they are not the end of paragraph
+ // then we remove those empty lines
+ // too many special check may cause some strange problem in the future
+ if (_str.empty()) {
+ while (!_textLines.empty() && !_textLines.back().paragraphEnd) {
+ removeLastLine();
+ }
+ }
+
+ if (!skipAdd) {
+ _str += str;
+ }
+
+ appendText_(str, oldLen);
+}
+
+void MacText::appendText_(const Common::U32String &strWithFont, uint oldLen) {
splitString(strWithFont);
recalcDims();
@@ -966,6 +1003,7 @@ void MacText::removeLastLine() {
void MacText::draw(ManagedSurface *g, int x, int y, int w, int h, int xoff, int yoff) {
if (_textLines.empty())
return;
+
render();
if (x + w < _surface->w || y + h < _surface->h)
diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index fbe2000f7e..a466baec20 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -186,6 +186,12 @@ public:
void appendText(const Common::U32String &str, int fontId = kMacFontChicago, int fontSize = 12, int fontSlant = kMacFontRegular, bool skipAdd = false);
void appendText(const Common::String &str, int fontId = kMacFontChicago, int fontSize = 12, int fontSlant = kMacFontRegular, bool skipAdd = false);
void appendText(const Common::U32String &str, int fontId = kMacFontChicago, int fontSize = 12, int fontSlant = kMacFontRegular, uint16 r = 0, uint16 g = 0, uint16 b = 0, bool skipAdd = false);
+ void appendText(const Common::U32String &str, const Font *font, uint16 r = 0, uint16 g = 0, uint16 b = 0, bool skipAdd = false);
+
+private:
+ void appendText_(const Common::U32String &strWithFont, uint oldLen);
+
+public:
void appendTextDefault(const Common::U32String &str, bool skipAdd = false);
void appendTextDefault(const Common::String &str, bool skipAdd = false);
void clearText();
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 80557d7fdf..ee323589dd 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -44,18 +44,29 @@ enum {
static void cursorTimerHandler(void *refCon);
MacTextWindow::MacTextWindow(MacWindowManager *wm, const MacFont *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, MacMenu *menu, bool cursorHandler) :
- MacWindow(wm->getLastId(), true, true, true, wm) {
+ MacWindow(wm->getLastId(), true, true, true, wm), _bgcolor(bgcolor), _maxWidth(maxWidth), _menu(menu) {
_font = font;
- _menu = menu;
_mactext = new MacText("", _wm, font, fgcolor, bgcolor, maxWidth, textAlignment);
_fontRef = wm->_fontMan->getFont(*font);
- _bgcolor = bgcolor;
+ init(cursorHandler);
+}
+
+MacTextWindow::MacTextWindow(MacWindowManager *wm, const Font *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, MacMenu *menu, bool cursorHandler) :
+ MacWindow(wm->getLastId(), true, true, true, wm), _bgcolor(bgcolor), _maxWidth(maxWidth), _menu(menu) {
+
+ _font = nullptr;
+ _mactext = new MacText(Common::U32String(""), _wm, font, fgcolor, bgcolor, maxWidth, textAlignment);
+
+ _fontRef = font;
+ init(cursorHandler);
+}
+
+void MacTextWindow::init(bool cursorHandler) {
_inputTextHeight = 0;
- _maxWidth = maxWidth;
_inputIsDirty = true;
_inTextSelection = false;
@@ -109,7 +120,12 @@ void MacTextWindow::appendText(const Common::U32String &str, const MacFont *macF
uint16 red = (_textColorRGB >> 16) & 0xFF;
uint16 green = (_textColorRGB >> 8) & 0xFF;
uint16 blue = (_textColorRGB) & 0xFF;
- _mactext->appendText(str, macFont->getId(), macFont->getSize(), macFont->getSlant(), red, green, blue, skipAdd);
+
+ if (macFont)
+ _mactext->appendText(str, macFont->getId(), macFont->getSize(), macFont->getSlant(), red, green, blue, skipAdd);
+ else {
+ _mactext->appendText(str, _fontRef, red, green, blue, skipAdd);
+ }
_contentIsDirty = true;
_inputIsDirty = true; //force it to redraw input
diff --git a/graphics/macgui/mactextwindow.h b/graphics/macgui/mactextwindow.h
index d90e593d89..7265f40f0e 100644
--- a/graphics/macgui/mactextwindow.h
+++ b/graphics/macgui/mactextwindow.h
@@ -31,6 +31,7 @@ namespace Graphics {
class MacTextWindow : public MacWindow {
public:
MacTextWindow(MacWindowManager *wm, const MacFont *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, MacMenu *menu, bool cursorHandler = true);
+ MacTextWindow(MacWindowManager *wm, const Font *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, MacMenu *menu, bool cursorHandler = true);
virtual ~MacTextWindow();
virtual void resize(int w, int h, bool inner = false);
@@ -44,8 +45,8 @@ public:
void setTextWindowFont(const MacFont *macFont);
const MacFont *getTextWindowFont();
- void appendText(const Common::U32String &str, const MacFont *macFont, bool skipAdd = false);
- void appendText(const Common::String &str, const MacFont *macFont, bool skipAdd = false);
+ void appendText(const Common::U32String &str, const MacFont *macFont = nullptr, bool skipAdd = false);
+ void appendText(const Common::String &str, const MacFont *macFont = nullptr, bool skipAdd = false);
void clearText();
void setEditable(bool editable) { _editable = editable; }
@@ -71,6 +72,7 @@ public:
void setTextColorRGB (uint32 rgb) { _textColorRGB = rgb; }
private:
+ void init(bool cursorHandler);
bool isCutAllowed();
void scroll(int delta);
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index cd710838fb..9f55fd1988 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -314,6 +314,16 @@ MacTextWindow *MacWindowManager::addTextWindow(const MacFont *font, int fgcolor,
return w;
}
+MacTextWindow *MacWindowManager::addTextWindow(const Font *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, MacMenu *menu, bool cursorHandler) {
+ MacTextWindow *w = new MacTextWindow(this, font, fgcolor, bgcolor, maxWidth, textAlignment, menu, cursorHandler);
+
+ addWindowInitialized(w);
+
+ setActiveWindow(getNextId());
+
+ return w;
+}
+
void MacWindowManager::addWindowInitialized(MacWindow *macwindow) {
_windows[macwindow->getId()] = macwindow;
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index e0d13feaef..7ea5d9b33b 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -171,6 +171,7 @@ public:
*/
MacWindow *addWindow(bool scrollable, bool resizable, bool editable);
MacTextWindow *addTextWindow(const MacFont *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, MacMenu *menu, bool cursorHandler = true);
+ MacTextWindow *addTextWindow(const Font *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, MacMenu *menu, bool cursorHandler = true);
/**
* Adds a window that has already been initialized to the registry.
Commit: 078eaf30798ef47bcece335d259586b5c706df38
https://github.com/scummvm/scummvm/commit/078eaf30798ef47bcece335d259586b5c706df38
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-02T01:03:02+02:00
Commit Message:
PINK: Switch MacTexWindow to windows font too
Changed paths:
engines/pink/objects/actions/action_text.cpp
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index d4b3c04665..1313c3d883 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -114,8 +114,7 @@ void ActionText::start() {
_text.deleteLastChar();
if (_scrollBar) {
- Graphics::MacFont *font = new Graphics::MacFont;
- _txtWnd = director->getWndManager().addTextWindow(font, _textColorIndex, _backgroundColorIndex,
+ _txtWnd = director->getWndManager().addTextWindow(director->getTextFont(), _textColorIndex, _backgroundColorIndex,
_xRight - _xLeft, align, nullptr, false);
_txtWnd->setTextColorRGB(_textRGB);
_txtWnd->enableScrollbar(true);
@@ -126,7 +125,7 @@ void ActionText::start() {
_txtWnd->setEditable(false);
_txtWnd->setSelectable(false);
- _txtWnd->appendText(_text, font);
+ _txtWnd->appendText(_text);
director->addTextWindow(_txtWnd);
} else {
Commit: c652741e160c3e45acbb87026eed94a683375e3c
https://github.com/scummvm/scummvm/commit/c652741e160c3e45acbb87026eed94a683375e3c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-02T01:03:02+02:00
Commit Message:
PINK: Fix encoding for Polish
Changed paths:
engines/pink/objects/actions/action_text.cpp
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index 1313c3d883..8ce1d755f6 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -91,6 +91,10 @@ void ActionText::start() {
_text = Common::String(str).decode(Common::kWindows1251);
break;
+ case Common::PL_POL:
+ _text = Common::String(str).decode(Common::kWindows1250);
+ break;
+
case Common::DA_DAN:
_text = Common::String(str).decode(Common::kWindows1252);
break;
Commit: c7517e2eac28b830d73e25126d73ed550e886f0d
https://github.com/scummvm/scummvm/commit/c7517e2eac28b830d73e25126d73ed550e886f0d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-02T01:03:02+02:00
Commit Message:
PINK: Fixes for Finnish version
Changed paths:
engines/pink/objects/actions/action_text.cpp
engines/pink/pink.cpp
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index 8ce1d755f6..f893fcf32c 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -87,18 +87,14 @@ void ActionText::start() {
delete stream;
switch(_actor->getPage()->getGame()->getLanguage()) {
- case Common::RU_RUS:
- _text = Common::String(str).decode(Common::kWindows1251);
- break;
-
- case Common::PL_POL:
- _text = Common::String(str).decode(Common::kWindows1250);
- break;
-
case Common::DA_DAN:
_text = Common::String(str).decode(Common::kWindows1252);
break;
+ case Common::FI_FIN:
+ _text = Common::String(str).decode(Common::kWindows1257);
+ break;
+
case Common::HE_ISR:
_text = Common::String(str).decode(Common::kWindows1255);
if (!_centered) {
@@ -106,6 +102,14 @@ void ActionText::start() {
}
break;
+ case Common::PL_POL:
+ _text = Common::String(str).decode(Common::kWindows1250);
+ break;
+
+ case Common::RU_RUS:
+ _text = Common::String(str).decode(Common::kWindows1251);
+ break;
+
case Common::EN_ANY:
default:
_text = Common::String(str);
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 0d8108c0ae..1fa1a7b6d3 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -101,7 +101,7 @@ Common::Error PinkEngine::init() {
return Common::kNoGameDataFoundError;
if (_orb.getTimestamp() != _bro->getTimestamp()) {
warning("ORB and BRO timestamp mismatch. %x != %x", _orb.getTimestamp(), _bro->getTimestamp());
- return Common::kNoGameDataFoundError;
+ //return Common::kNoGameDataFoundError;
}
}
Commit: b3cf5c0383d8d51054bc706ea41e35f4d716b42f
https://github.com/scummvm/scummvm/commit/b3cf5c0383d8d51054bc706ea41e35f4d716b42f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-02T01:03:02+02:00
Commit Message:
PINK: Specify encoding for the rest of the game languages
Changed paths:
engines/pink/objects/actions/action_text.cpp
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index f893fcf32c..2aafc2b61d 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -88,10 +88,14 @@ void ActionText::start() {
switch(_actor->getPage()->getGame()->getLanguage()) {
case Common::DA_DAN:
+ case Common::ES_ESP:
+ case Common::FR_FRA:
+ case Common::PT_BRA:
_text = Common::String(str).decode(Common::kWindows1252);
break;
case Common::FI_FIN:
+ case Common::SE_SWE:
_text = Common::String(str).decode(Common::kWindows1257);
break;
Commit: 7fde53d5f719ae85cc2f3496b61002ce88f9673d
https://github.com/scummvm/scummvm/commit/7fde53d5f719ae85cc2f3496b61002ce88f9673d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-02T01:11:04+02:00
Commit Message:
BASE: Remove redundant warning. It will be triggered at the end of the function
Changed paths:
base/commandLine.cpp
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 60ce532b2e..b19e87fa29 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -1482,9 +1482,6 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo
upgradeTargets();
return true;
#endif
- } else {
- if (!command.empty())
- warning("processSettings(): Unhandled command line parameter \"%s\"", command.c_str());
}
#endif // DISABLE_COMMAND_LINE
More information about the Scummvm-git-logs
mailing list