[Scummvm-git-logs] scummvm master -> b438f6fb0725a6356a514f1eb951d1557f8b5ceb
sev-
sev at scummvm.org
Sat Aug 22 23:23:46 UTC 2020
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
dcfcb39de9 COMMON: Removed non-octal number from GUIO
bd8eb63e9a COMMON: Moved GUIO constants to hex codes for avoiding devs' confusion
cfa0be7e35 DIRECTOR: Fix signed/unsigned comparison
9a9c32f663 DIRECTOR: LINGO: Fix warnings
b438f6fb07 DIRECTOR: Fix warnings
Commit: dcfcb39de908f9ec7004b7ecb479ce586d55d5f1
https://github.com/scummvm/scummvm/commit/dcfcb39de908f9ec7004b7ecb479ce586d55d5f1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-23T01:04:02+02:00
Commit Message:
COMMON: Removed non-octal number from GUIO
Changed paths:
common/gui_options.h
diff --git a/common/gui_options.h b/common/gui_options.h
index eca75e6877..a67dbb9667 100644
--- a/common/gui_options.h
+++ b/common/gui_options.h
@@ -41,11 +41,11 @@
#define GUIO_MIDIAPPLEIIGS "\015"
#define GUIO_MIDITOWNS "\016"
#define GUIO_MIDIPC98 "\017"
-#define GUIO_MIDISEGACD "\018"
-#define GUIO_MIDIMT32 "\020"
-#define GUIO_MIDIGM "\021"
+#define GUIO_MIDISEGACD "\020"
+#define GUIO_MIDIMT32 "\021"
+#define GUIO_MIDIGM "\022"
-#define GUIO_NOASPECT "\022"
+#define GUIO_NOASPECT "\023"
#define GUIO_RENDERHERCGREEN "\030"
#define GUIO_RENDERHERCAMBER "\031"
Commit: bd8eb63e9a4423baa8c0cd2a99d35b763a3376a0
https://github.com/scummvm/scummvm/commit/bd8eb63e9a4423baa8c0cd2a99d35b763a3376a0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-23T01:08:47+02:00
Commit Message:
COMMON: Moved GUIO constants to hex codes for avoiding devs' confusion
Changed paths:
common/gui_options.h
diff --git a/common/gui_options.h b/common/gui_options.h
index a67dbb9667..e07da2709c 100644
--- a/common/gui_options.h
+++ b/common/gui_options.h
@@ -23,64 +23,64 @@
#ifndef COMMON_GUI_OPTIONS_H
#define COMMON_GUI_OPTIONS_H
-#define GUIO_NONE "\000"
-#define GUIO_NOSUBTITLES "\001"
-#define GUIO_NOMUSIC "\002"
+#define GUIO_NONE "\x00"
+#define GUIO_NOSUBTITLES "\x01"
+#define GUIO_NOMUSIC "\x02"
// GUIO_NOSPEECH is a combination of GUIO_NOSPEECHVOLUME and GUIO_NOSUBTITLES
-#define GUIO_NOSPEECH "\003"
-#define GUIO_NOSFX "\004"
-#define GUIO_NOMIDI "\005"
-#define GUIO_NOLAUNCHLOAD "\006"
+#define GUIO_NOSPEECH "\x03"
+#define GUIO_NOSFX "\x04"
+#define GUIO_NOMIDI "\x05"
+#define GUIO_NOLAUNCHLOAD "\x06"
-#define GUIO_MIDIPCSPK "\007"
-#define GUIO_MIDICMS "\010"
-#define GUIO_MIDIPCJR "\011"
-#define GUIO_MIDIADLIB "\012"
-#define GUIO_MIDIC64 "\013"
-#define GUIO_MIDIAMIGA "\014"
-#define GUIO_MIDIAPPLEIIGS "\015"
-#define GUIO_MIDITOWNS "\016"
-#define GUIO_MIDIPC98 "\017"
-#define GUIO_MIDISEGACD "\020"
-#define GUIO_MIDIMT32 "\021"
-#define GUIO_MIDIGM "\022"
+#define GUIO_MIDIPCSPK "\x07"
+#define GUIO_MIDICMS "\x08"
+#define GUIO_MIDIPCJR "\x09"
+#define GUIO_MIDIADLIB "\x0a"
+#define GUIO_MIDIC64 "\x0b"
+#define GUIO_MIDIAMIGA "\x0c"
+#define GUIO_MIDIAPPLEIIGS "\x0d"
+#define GUIO_MIDITOWNS "\x0e"
+#define GUIO_MIDIPC98 "\x0f"
+#define GUIO_MIDISEGACD "\x10"
+#define GUIO_MIDIMT32 "\x11"
+#define GUIO_MIDIGM "\x12"
-#define GUIO_NOASPECT "\023"
+#define GUIO_NOASPECT "\x13"
-#define GUIO_RENDERHERCGREEN "\030"
-#define GUIO_RENDERHERCAMBER "\031"
-#define GUIO_RENDERCGA "\032"
-#define GUIO_RENDEREGA "\033"
-#define GUIO_RENDERVGA "\034"
-#define GUIO_RENDERAMIGA "\035"
-#define GUIO_RENDERFMTOWNS "\036"
-#define GUIO_RENDERPC9821 "\037"
-#define GUIO_RENDERPC9801 "\040"
-#define GUIO_RENDERAPPLE2GS "\041"
-#define GUIO_RENDERATARIST "\042"
-#define GUIO_RENDERMACINTOSH "\043"
+#define GUIO_RENDERHERCGREEN "\x18"
+#define GUIO_RENDERHERCAMBER "\x19"
+#define GUIO_RENDERCGA "\x1a"
+#define GUIO_RENDEREGA "\x1b"
+#define GUIO_RENDERVGA "\x1c"
+#define GUIO_RENDERAMIGA "\x1d"
+#define GUIO_RENDERFMTOWNS "\x1e"
+#define GUIO_RENDERPC9821 "\x1f"
+#define GUIO_RENDERPC9801 "\x20"
+#define GUIO_RENDERAPPLE2GS "\x21"
+#define GUIO_RENDERATARIST "\x22"
+#define GUIO_RENDERMACINTOSH "\x23"
-#define GUIO_LINKSPEECHTOSFX "\044"
-#define GUIO_LINKMUSICTOSFX "\045"
-#define GUIO_NOSPEECHVOLUME "\046"
+#define GUIO_LINKSPEECHTOSFX "\x24"
+#define GUIO_LINKMUSICTOSFX "\x25"
+#define GUIO_NOSPEECHVOLUME "\x26"
// Special GUIO flags for the AdvancedDetector's caching of game specific
// options.
-#define GUIO_GAMEOPTIONS1 "\050"
-#define GUIO_GAMEOPTIONS2 "\051"
-#define GUIO_GAMEOPTIONS3 "\052"
-#define GUIO_GAMEOPTIONS4 "\053"
-#define GUIO_GAMEOPTIONS5 "\054"
-#define GUIO_GAMEOPTIONS6 "\055"
-#define GUIO_GAMEOPTIONS7 "\056"
-#define GUIO_GAMEOPTIONS8 "\057"
-#define GUIO_GAMEOPTIONS9 "\060"
-#define GUIO_GAMEOPTIONS10 "\061"
-#define GUIO_GAMEOPTIONS11 "\062"
-#define GUIO_GAMEOPTIONS12 "\063"
-#define GUIO_GAMEOPTIONS13 "\064"
-#define GUIO_GAMEOPTIONS14 "\065"
-#define GUIO_GAMEOPTIONS15 "\066"
+#define GUIO_GAMEOPTIONS1 "\x30"
+#define GUIO_GAMEOPTIONS2 "\x31"
+#define GUIO_GAMEOPTIONS3 "\x32"
+#define GUIO_GAMEOPTIONS4 "\x33"
+#define GUIO_GAMEOPTIONS5 "\x34"
+#define GUIO_GAMEOPTIONS6 "\x35"
+#define GUIO_GAMEOPTIONS7 "\x36"
+#define GUIO_GAMEOPTIONS8 "\x37"
+#define GUIO_GAMEOPTIONS9 "\x38"
+#define GUIO_GAMEOPTIONS10 "\x39"
+#define GUIO_GAMEOPTIONS11 "\x3a"
+#define GUIO_GAMEOPTIONS12 "\x3b"
+#define GUIO_GAMEOPTIONS13 "\x3c"
+#define GUIO_GAMEOPTIONS14 "\x3d"
+#define GUIO_GAMEOPTIONS15 "\x3e"
#define GUIO0() (GUIO_NONE)
#define GUIO1(a) (a)
Commit: cfa0be7e35328cb1e5c98f3982d88930ad4ad75d
https://github.com/scummvm/scummvm/commit/cfa0be7e35328cb1e5c98f3982d88930ad4ad75d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-23T01:15:17+02:00
Commit Message:
DIRECTOR: Fix signed/unsigned comparison
Changed paths:
engines/director/lingo/lingo-lex.cpp
engines/director/lingo/lingo-lex.l
engines/director/lingo/lingo.h
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 61439ea7b2..51b2f34ad4 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -431,7 +431,7 @@ static const YY_CHAR yy_ec[256] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 2, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1
@@ -771,7 +771,7 @@ static const char *inputbuffer;
static uint inputlen;
// Push lines in stack
-static void pushLine(int num) {
+static void pushLine(uint num) {
if (num > inputlen)
return;
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 3e5a3768d1..e50c2aab46 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -46,7 +46,7 @@ static const char *inputbuffer;
static uint inputlen;
// Push lines in stack
-static void pushLine(int num) {
+static void pushLine(uint num) {
if (num > inputlen)
return;
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index a0de86fe83..f2f0009db5 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -400,9 +400,9 @@ public:
ScriptData *_currentAssembly;
LexerDefineState _indef;
LexerDefineState _indefStore;
- int _linenumber;
- int _colnumber;
- int _bytenumber;
+ uint _linenumber;
+ uint _colnumber;
+ uint _bytenumber;
const char *_lines[3];
bool _inFactory;
Common::Array<RepeatBlock *> _repeatStack;
Commit: 9a9c32f66340bc4836f9be2261333dfd50a92471
https://github.com/scummvm/scummvm/commit/9a9c32f66340bc4836f9be2261333dfd50a92471
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-23T01:16:57+02:00
Commit Message:
DIRECTOR: LINGO: Fix warnings
Changed paths:
engines/director/lingo/lingo-the.cpp
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 04939bbe65..9a4c6bd12a 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1263,7 +1263,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
switch (field) {
case kTheBackColor:
- if (d.asInt() != sprite->_backColor) {
+ if ((uint32)d.asInt() != sprite->_backColor) {
sprite->_backColor = d.asInt();
channel->_dirty = true;
}
@@ -1333,7 +1333,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
channel->setEditable(d.asInt());
break;
case kTheForeColor:
- if (d.asInt() != sprite->_foreColor) {
+ if ((uint32)d.asInt() != sprite->_foreColor) {
sprite->_foreColor = d.asInt();
channel->_dirty = true;
}
Commit: b438f6fb0725a6356a514f1eb951d1557f8b5ceb
https://github.com/scummvm/scummvm/commit/b438f6fb0725a6356a514f1eb951d1557f8b5ceb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-23T01:23:28+02:00
Commit Message:
DIRECTOR: Fix warnings
Changed paths:
engines/director/graphics.cpp
engines/director/window.cpp
engines/director/window.h
diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index c2e60f4177..920292633e 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -180,7 +180,7 @@ void inkDrawPixel(int x, int y, int src, void *data) {
switch (p->ink) {
case kInkTypeBackgndTrans:
- if (src == p->backColor)
+ if ((uint32)src == p->backColor)
break;
// fall through
case kInkTypeMatte:
@@ -247,7 +247,7 @@ void inkDrawPixel(int x, int y, int src, void *data) {
break;
// Arithmetic ink types
default: {
- if (src == p->colorWhite)
+ if ((uint32)src == p->colorWhite)
break;
byte rSrc, gSrc, bSrc;
diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index 1731c53ff8..b4fb77e70d 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -303,7 +303,7 @@ void Window::inkBlitStretchSurface(DirectorPlotData *pd, Common::Rect &srcRect,
}
}
-int Window::preprocessColor(DirectorPlotData *p, int src) {
+int Window::preprocessColor(DirectorPlotData *p, uint32 src) {
// HACK: Right now this method is just used for adjusting the colourization on text
// sprites, as it would be costly to colourize the chunks on the fly each
// time a section needs drawing. It's ugly but mostly works.
diff --git a/engines/director/window.h b/engines/director/window.h
index e619b11f68..e49ed2e522 100644
--- a/engines/director/window.h
+++ b/engines/director/window.h
@@ -185,7 +185,7 @@ private:
bool _titleVisible;
private:
- int preprocessColor(DirectorPlotData *p, int src);
+ int preprocessColor(DirectorPlotData *p, uint32 src);
void inkBlitFrom(Channel *channel, Common::Rect destRect, Graphics::ManagedSurface *blitTo = nullptr);
void inkBlitShape(DirectorPlotData *pd, Common::Rect &srcRect);
More information about the Scummvm-git-logs
mailing list