[Scummvm-git-logs] scummvm master -> cdbdb58e07cc2235cd24ce2d6e8ea515938fdd93
dwatteau
noreply at scummvm.org
Tue Mar 7 12:53:36 UTC 2023
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2d0d32e214 TINYGL: Fix MSVC C4309 enum sign warning
09419beae0 GRIM: Fix MSVC C4245 char/uint8 warning
2b13af4004 JANITORIAL: TONY: Fix small typos
37e3146f49 JANITORIAL: CREATE_PROJECT: Fix a small typo
7a7a1552b2 JANITORIAL: SCUMM: Fix some typos and extra semicolons
cc30927ace JANITORIAL: CHAMBER: Remove stray semicolon
e776d04cc5 JANITORIAL: IMMORTAL: Remove stray semicolon
cdbdb58e07 MACOS: BUILD: Don't depend on `xattr` on older OSX
Commit: 2d0d32e214898c830604947ea04567bc85c9f914
https://github.com/scummvm/scummvm/commit/2d0d32e214898c830604947ea04567bc85c9f914
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-07T13:52:18+01:00
Commit Message:
TINYGL: Fix MSVC C4309 enum sign warning
Changed paths:
graphics/tinygl/gl.h
diff --git a/graphics/tinygl/gl.h b/graphics/tinygl/gl.h
index 63c6593613a..25aa10d8e2f 100644
--- a/graphics/tinygl/gl.h
+++ b/graphics/tinygl/gl.h
@@ -706,7 +706,7 @@ enum {
TGL_ALL_ATTRIB_BITS = 0x000fffff
};
-enum {
+enum : unsigned int {
// Client Attrib Mask
TGL_CLIENT_PIXEL_STORE_BIT = 1,
TGL_CLIENT_VERTEX_ARRAY_BIT = 2,
Commit: 09419beae0a7400352511660c1c1866a65df7ec5
https://github.com/scummvm/scummvm/commit/09419beae0a7400352511660c1c1866a65df7ec5
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-07T13:52:18+01:00
Commit Message:
GRIM: Fix MSVC C4245 char/uint8 warning
Related to commit 6df761e70eccad92976644ce6a09ee27edca1f47.
Changed paths:
engines/grim/gfx_opengl.cpp
engines/grim/gfx_opengl_shaders.cpp
engines/grim/gfx_tinygl.cpp
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index 192ca887070..8b6a9a823c7 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/engines/grim/gfx_opengl.cpp
@@ -1568,11 +1568,11 @@ void GfxOpenGL::createTexture(Texture *texture, const uint8 *data, const CMap *c
if (col == 0) {
memset(texdatapos, 0, bytes); // transparent
if (!texture->_hasAlpha) {
- texdatapos[3] = '\xff'; // fully opaque
+ texdatapos[3] = 0xff; // fully opaque
}
} else {
memcpy(texdatapos, cmap->_colors + 3 * (col), 3);
- texdatapos[3] = '\xff'; // fully opaque
+ texdatapos[3] = 0xff; // fully opaque
}
texdatapos += bytes;
data++;
diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp
index d8151121e86..8e26eea5103 100644
--- a/engines/grim/gfx_opengl_shaders.cpp
+++ b/engines/grim/gfx_opengl_shaders.cpp
@@ -1259,11 +1259,11 @@ void GfxOpenGLS::createTexture(Texture *texture, const uint8 *data, const CMap *
if (col == 0) {
memset(texdatapos, 0, bytes); // transparent
if (!texture->_hasAlpha) {
- texdatapos[3] = '\xff'; // fully opaque
+ texdatapos[3] = 0xff; // fully opaque
}
} else {
memcpy(texdatapos, cmap->_colors + 3 * (col), 3);
- texdatapos[3] = '\xff'; // fully opaque
+ texdatapos[3] = 0xff; // fully opaque
}
texdatapos += bytes;
data++;
diff --git a/engines/grim/gfx_tinygl.cpp b/engines/grim/gfx_tinygl.cpp
index 263df3d7460..05c9747ddd9 100644
--- a/engines/grim/gfx_tinygl.cpp
+++ b/engines/grim/gfx_tinygl.cpp
@@ -1113,11 +1113,11 @@ void GfxTinyGL::createTexture(Texture *texture, const uint8 *data, const CMap *c
if (col == 0) {
memset(texdatapos, 0, 4); // transparent
if (!texture->_hasAlpha) {
- texdatapos[3] = '\xff'; // fully opaque
+ texdatapos[3] = 0xff; // fully opaque
}
} else {
memcpy(texdatapos, cmap->_colors + 3 * (col), 3);
- texdatapos[3] = '\xff'; // fully opaque
+ texdatapos[3] = 0xff; // fully opaque
}
texdatapos += 4;
data++;
Commit: 2b13af4004c3bdb99fb912ef6b830e949a1d50f4
https://github.com/scummvm/scummvm/commit/2b13af4004c3bdb99fb912ef6b830e949a1d50f4
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-07T13:52:18+01:00
Commit Message:
JANITORIAL: TONY: Fix small typos
Changed paths:
engines/tony/mpal/expr.cpp
engines/tony/mpal/expr.h
diff --git a/engines/tony/mpal/expr.cpp b/engines/tony/mpal/expr.cpp
index 6643dd9bf45..c1262df7156 100644
--- a/engines/tony/mpal/expr.cpp
+++ b/engines/tony/mpal/expr.cpp
@@ -245,7 +245,7 @@ const byte *parseExpression(const byte *lpBuf, const Common::UnalignedPtr<MpalHa
}
/**
- * Calculate the value of a mathamatical expression
+ * Calculate the value of a mathematical expression
*
* @param h Handle to the expression
* @returns Numeric value
diff --git a/engines/tony/mpal/expr.h b/engines/tony/mpal/expr.h
index a42c69e83cc..67cb4efb5d0 100644
--- a/engines/tony/mpal/expr.h
+++ b/engines/tony/mpal/expr.h
@@ -34,7 +34,7 @@ namespace Tony {
namespace MPAL {
/**
- * @defgroup Mathamatical operations
+ * @defgroup Mathematical operations
*/
//@{
@@ -65,7 +65,7 @@ namespace MPAL {
//@{
/**
- * Mathamatical framework to manage operations
+ * Mathematical framework to manage operations
*/
typedef struct {
byte _type; // Object Type (see enum ExprListTypes)
@@ -109,7 +109,7 @@ enum ExprListTypes {
const byte *parseExpression(const byte *lpBuf, const Common::UnalignedPtr<MpalHandle> &h);
/**
- * Calculate the value of a mathamatical expression
+ * Calculate the value of a mathematical expression
*
* @param h Handle to the expression
* @returns Numeric value
Commit: 37e3146f49e00365cd0ba00fdf2904bda8e9dcb4
https://github.com/scummvm/scummvm/commit/37e3146f49e00365cd0ba00fdf2904bda8e9dcb4
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-07T13:52:18+01:00
Commit Message:
JANITORIAL: CREATE_PROJECT: Fix a small typo
Changed paths:
devtools/create_project/create_project.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 44dd5ea1a68..3f0df8acd2d 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -396,7 +396,7 @@ int main(int argc, char *argv[]) {
setup.defines.push_back("POSIX");
// Define both MACOSX, and IPHONE, but only one of them will be associated to the
// correct target by the Xcode project provider.
- // This define will help catching up target dependend files, like "browser_osx.mm"
+ // This define will help catching up target-dependent files, like "browser_osx.mm"
// The suffix ("_osx", or "_ios") will be used by the project provider to filter out
// the files, according to the target.
setup.defines.push_back("MACOSX");
Commit: 7a7a1552b2c49d81c1cc106e4fc699649e0059df
https://github.com/scummvm/scummvm/commit/7a7a1552b2c49d81c1cc106e4fc699649e0059df
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-07T13:52:18+01:00
Commit Message:
JANITORIAL: SCUMM: Fix some typos and extra semicolons
Changed paths:
engines/scumm/dialogs.cpp
engines/scumm/smush/smush_player.cpp
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index b7be2014763..71f53be5747 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -572,7 +572,7 @@ const Common::U32String InfoDialog::queryResString(int stringno) {
const ResString &InfoDialog::getStaticResString(Common::Language lang, int stringno) {
// The string parts are only needed for v1/2. So we need to provide only the
- // language varieties that exist for these. I have added the langugage I found
+ // language varieties that exist for these. I have added the languages I found
// in scumm-md5.h. I guess we could actually ditch the first 3 lines...
static const ResString strMap1[][6] = {
{ // English
@@ -752,7 +752,7 @@ const ResString &InfoDialog::getStaticResString(Common::Language lang, int strin
bool useHardcodedV3QuitPrompt = stringno == 5 && _vm->_game.version == 3 && _vm->_game.id != GID_LOOM;
bool useFixedDottMenuStrings = stringno >= 21 && stringno <= 26 && _vm->_game.id == GID_TENTACLE;
- // I have added the langugages I found in scumm-md5.h for v1/2 games...
+ // I have added the languages I found in scumm-md5.h for v1/2 games...
int langIndex = 0;
switch (lang) {
case Common::FR_FRA:
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 393afd01a82..365f1e5755b 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1628,7 +1628,7 @@ void SmushPlayer::processDispatches(int16 feedSize) {
break;
default:
error("SmushPlayer::processDispatches(): unrecognized flag %d", _smushTracks[i].flags & TRK_TYPE_MASK);
- };
+ }
mixVolume = baseVolume * _smushTrackVols[0] / 127;
if ((flags & TRK_TYPE_MASK) == IS_BKG_MUSIC && isChanActive(CHN_SPEECH))
@@ -1813,7 +1813,7 @@ void SmushPlayer::processDispatches(int16 feedSize) {
_smushTracks[i].audioRemaining = _smushDispatch[i].audioRemaining;
_smushDispatch[i].state = _smushTracks[i].state;
- };
+ }
if (speechIsPlaying) {
if (_gainReductionMultiplier > _gainReductionLowerBound) {
Commit: cc30927ace40d2dc50560aecb2c5bd8d75ea0a22
https://github.com/scummvm/scummvm/commit/cc30927ace40d2dc50560aecb2c5bd8d75ea0a22
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-07T13:52:18+01:00
Commit Message:
JANITORIAL: CHAMBER: Remove stray semicolon
Changed paths:
engines/chamber/script.cpp
diff --git a/engines/chamber/script.cpp b/engines/chamber/script.cpp
index c775b55e399..0a49485170d 100644
--- a/engines/chamber/script.cpp
+++ b/engines/chamber/script.cpp
@@ -2875,7 +2875,7 @@ static void AnimSaucer(void) {
for (i = delay; i--;) ; /*TODO: weak delay*/
delay += 500;
}
-};
+}
extern int16 loadSplash(const char *filename);
Commit: e776d04cc5330dc267be48d09e5ca9cf7493f0f9
https://github.com/scummvm/scummvm/commit/e776d04cc5330dc267be48d09e5ca9cf7493f0f9
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-07T13:52:18+01:00
Commit Message:
JANITORIAL: IMMORTAL: Remove stray semicolon
Changed paths:
engines/immortal/utilities.cpp
diff --git a/engines/immortal/utilities.cpp b/engines/immortal/utilities.cpp
index 03e5107fc4e..46df475fb7d 100644
--- a/engines/immortal/utilities.cpp
+++ b/engines/immortal/utilities.cpp
@@ -108,4 +108,4 @@ bool Utilities::insideRect(uint8 rectX, uint8 rectY, uint8 w, uint8 h, uint8 poi
return false;
}
-}; // namespace Immortal
+} // namespace Immortal
Commit: cdbdb58e07cc2235cd24ce2d6e8ea515938fdd93
https://github.com/scummvm/scummvm/commit/cdbdb58e07cc2235cd24ce2d6e8ea515938fdd93
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-07T13:52:18+01:00
Commit Message:
MACOS: BUILD: Don't depend on `xattr` on older OSX
The API was there but not the tool (which appeared in Leopard), and
even if you give it a replacement, Finder/TextEdit won't use the extra
encoding metadata that's used there, so it's useless on older OSX.
Changed paths:
ports.mk
diff --git a/ports.mk b/ports.mk
index 3f41dc62245..5857c35ef2d 100644
--- a/ports.mk
+++ b/ports.mk
@@ -599,7 +599,7 @@ osxsnap: bundle
cp $(DIST_FILES_DOCS_se) ./ScummVM-snapshot/doc/se/
$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/doc/QuickStart
$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/doc/*/*
- xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/*/*
+ command -v xattr >/dev/null 2>&1 && xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/*/*
cp -RP $(bundle_name) ./ScummVM-snapshot/
cp $(srcdir)/dists/macosx/DS_Store ./ScummVM-snapshot/.DS_Store
cp $(srcdir)/dists/macosx/background.jpg ./ScummVM-snapshot/background.jpg
More information about the Scummvm-git-logs
mailing list