[Scummvm-git-logs] scummvm master -> 030f104c120b750dbd99429eb20a4b8a417d968e

sev- noreply at scummvm.org
Tue Nov 29 00:38:06 UTC 2022 

This automated email contains information about 13 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8140fdfbcc COMMON: Fix MSVC C4309 enum sign warning
de88d24ef3 GRAPHICS: Fix MSVC C4309 enum sign warning
97137c29f5 ENGINES: Fix MSVC C4309 enum sign warning
baea7a3adc DRAGONS: Fix MSVC C4309 enum sign warning
4d2fe18ad8 GLK: Fix MSVC C4309 enum sign warning
0a873f738c LASTEXPRESS: Fix MSVC C4309 enum sign warning
6815ace672 MOHAWK: Fix MSVC C4309 enum sign warning
513a54be04 MTROPOLIS: Fix MSVC C4309 enum sign warning
cbea3840c1 MUTATIONOFJB: Fix MSVC C4309 enum sign warning
29004bee91 NEVERHOOD: Fix MSVC C4309 enum sign warning
93502a71ed PARALLACTION: Fix MSVC C4309 enum sign warning
25842987ef SCI: Fix MSVC C4309 enum sign warning
030f104c12 SCUMM: Fix MSVC C4309 enum sign warning


Commit: 8140fdfbccb5bfa972aa7975d1f66bc24f91be69
    https://github.com/scummvm/scummvm/commit/8140fdfbccb5bfa972aa7975d1f66bc24f91be69
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
COMMON: Fix MSVC C4309 enum sign warning

Changed paths:
    common/span.h


diff --git a/common/span.h b/common/span.h
index 85052af6473..3fbdfd1538a 100644
--- a/common/span.h
+++ b/common/span.h
@@ -42,7 +42,7 @@ namespace Common {
 	typedef typename super_type::reference reference; \
 	typedef typename super_type::const_reference const_reference;
 
-enum {
+enum : uint {
 	kSpanMaxSize = 0xFFFFFFFF,
 	kSpanKeepOffset = 0xFFFFFFFF
 };


Commit: de88d24ef35e54564eab2d58eddcf49698b78d3e
    https://github.com/scummvm/scummvm/commit/de88d24ef35e54564eab2d58eddcf49698b78d3e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
GRAPHICS: Fix MSVC C4309 enum sign warning

Changed paths:
    graphics/colormasks.h


diff --git a/graphics/colormasks.h b/graphics/colormasks.h
index 10401e22102..cead631a495 100644
--- a/graphics/colormasks.h
+++ b/graphics/colormasks.h
@@ -65,7 +65,7 @@ The meaning of these is masks is the following:
 
 template<>
 struct ColorMasks<565> {
-	enum {
+	enum : uint {
 		kHighBitsMask    = 0xF7DEF7DE,
 		kLowBitsMask     = 0x08210821,
 		qhighBits   = 0xE79CE79C,


Commit: 97137c29f504c483bb17d474e17af291a218608f
    https://github.com/scummvm/scummvm/commit/97137c29f504c483bb17d474e17af291a218608f
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
ENGINES: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/advancedDetector.h


diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index c20812cd9d2..6d083010979 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -89,7 +89,7 @@ struct ADGameFileDescription {
  *
  * Note that the lowest 16 bits are currently reserved for use by the client code.
  */
-enum ADGameFlags {
+enum ADGameFlags : uint {
 	ADGF_NO_FLAGS        =  0u,        ///< No flags.
 	ADGF_TAILMD5         = (1u << 16), ///< Calculate the MD5 for this entry from the end of the file.
 	ADGF_AUTOGENTARGET   = (1u << 17), ///< Automatically generate gameid from @ref ADGameDescription::extra.


Commit: baea7a3adc76277199134b75f051d5983a49f664
    https://github.com/scummvm/scummvm/commit/baea7a3adc76277199134b75f051d5983a49f664
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
DRAGONS: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/dragons/dragons.h


diff --git a/engines/dragons/dragons.h b/engines/dragons/dragons.h
index ad8c9d22543..44e47aea442 100644
--- a/engines/dragons/dragons.h
+++ b/engines/dragons/dragons.h
@@ -45,7 +45,7 @@ enum kReadSaveHeaderError {
 	kRSHEIoError = 3
 };
 
-enum Flags {
+enum Flags : uint {
 	ENGINE_FLAG_1 = 1,
 	ENGINE_FLAG_2 = 2,
 	ENGINE_FLAG_4 = 4,


Commit: 4d2fe18ad85fed9d99ea135e29d020e538955070
    https://github.com/scummvm/scummvm/commit/4d2fe18ad85fed9d99ea135e29d020e538955070
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
GLK: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/glk/events.h


diff --git a/engines/glk/events.h b/engines/glk/events.h
index 800c0bfd2fa..be57b6c6bbc 100644
--- a/engines/glk/events.h
+++ b/engines/glk/events.h
@@ -55,7 +55,7 @@ enum EvType {
 /**
  * Keycodes
  */
-enum Keycode {
+enum Keycode : uint {
 	keycode_Unknown  = 0xffffffffU,
 	keycode_Left     = 0xfffffffeU,
 	keycode_Right    = 0xfffffffdU,


Commit: 0a873f738c8a89f9ddda3538aa7540b0230a40c1
    https://github.com/scummvm/scummvm/commit/0a873f738c8a89f9ddda3538aa7540b0230a40c1
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
LASTEXPRESS: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/lastexpress/shared.h


diff --git a/engines/lastexpress/shared.h b/engines/lastexpress/shared.h
index 59805dc3022..9c852e2498b 100644
--- a/engines/lastexpress/shared.h
+++ b/engines/lastexpress/shared.h
@@ -99,7 +99,7 @@ enum SoundTag {
     processes the sound as a payment for portability, so we can afford
     to just mix the silence without special processing of muted entries.
 */
-enum SoundFlag {
+enum SoundFlag : uint {
 	kSoundVolumeEntityDefault = 0xFFFFFFFF, // special value for SoundManager::playSound; choose volume based on distance to the entity
 
 	kVolumeNone               = 0x0,
@@ -172,7 +172,7 @@ enum AmbientSoundState {
 // Time is measured in ticks, with 15 ticks per second. One minute is 900
 // ticks, one hour is 54,000 ticks, and one day is 1,296,000 ticks.
 
-enum TimeValue {
+enum TimeValue : uint {
 	kTimeNone                 = 0,
 	kTime5933                 = 5933,
 
@@ -478,7 +478,7 @@ enum ChapterIndex {
 //////////////////////////////////////////////////////////////////////////
 // Index of scenes
 //////////////////////////////////////////////////////////////////////////
-enum SceneIndex {
+enum SceneIndex : uint {
 	kSceneNone                    = 0,
 	kSceneMenu                    = 1,
 


Commit: 6815ace67284f0333585d1549b06ecc3ffddf4be
    https://github.com/scummvm/scummvm/commit/6815ace67284f0333585d1549b06ecc3ffddf4be
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
MOHAWK: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/mohawk/view.h


diff --git a/engines/mohawk/view.h b/engines/mohawk/view.h
index 5c7774f081d..4c0e32897c8 100644
--- a/engines/mohawk/view.h
+++ b/engines/mohawk/view.h
@@ -32,7 +32,7 @@ class GraphicsManager;
 class Feature;
 class View;
 
-enum {
+enum : uint {
 	kFeatureObjectMask = 0xff, // both (sort of)
 	kFeatureOldSortForeground = 0x1000, // old
 	kFeatureOldDropSpot = 0x2000, // old


Commit: 513a54be04efcf8173036c6f5deab1c101fc4bd4
    https://github.com/scummvm/scummvm/commit/513a54be04efcf8173036c6f5deab1c101fc4bd4
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
MTROPOLIS: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/mtropolis/data.h


diff --git a/engines/mtropolis/data.h b/engines/mtropolis/data.h
index 463380f0008..a5f43e08c59 100644
--- a/engines/mtropolis/data.h
+++ b/engines/mtropolis/data.h
@@ -76,7 +76,7 @@ enum TextAlignmentCode {
 
 namespace DataObjectTypes {
 
-enum DataObjectType {
+enum DataObjectType : uint {
 	kUnknown								= 0,
 
 	kProjectLabelMap						= 0x22,
@@ -425,7 +425,7 @@ struct ProjectLabelMap : public DataObject {
 		LabelTree();
 		~LabelTree();
 
-		enum {
+		enum : uint {
 			kExpandedInEditor = 0x80000000,
 		};
 
@@ -719,7 +719,7 @@ protected:
 };
 
 struct SoundElement : public StructuralDef {
-	enum SoundFlags {
+	enum SoundFlags : uint {
 		kPaused = 0x40000000,
 		kLoop = 0x80000000,
 	};
@@ -1010,7 +1010,7 @@ protected:
 	DataReadErrorCode load(DataReader &reader) override;
 };
 
-enum MessageFlags {
+enum MessageFlags : uint {
 	kMessageFlagNoRelay = 0x20000000,
 	kMessageFlagNoCascade = 0x40000000,
 	kMessageFlagNoImmediate = 0x80000000,
@@ -1085,7 +1085,7 @@ protected:
 };
 
 struct ChangeSceneModifier : public DataObject {
-	enum ChangeSceneFlags {
+	enum ChangeSceneFlags : uint {
 		kChangeSceneFlagNextScene			= 0x80000000,
 		kChangeSceneFlagPrevScene			= 0x40000000,
 		kChangeSceneFlagSpecificScene		= 0x20000000,


Commit: cbea3840c10ffabf36ebb5e69b83cca4fc199459
    https://github.com/scummvm/scummvm/commit/cbea3840c10ffabf36ebb5e69b83cca4fc199459
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
MUTATIONOFJB: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/mutationofjb/widgets/widget.h


diff --git a/engines/mutationofjb/widgets/widget.h b/engines/mutationofjb/widgets/widget.h
index 6026b7606e3..eac3dd7b832 100644
--- a/engines/mutationofjb/widgets/widget.h
+++ b/engines/mutationofjb/widgets/widget.h
@@ -39,7 +39,7 @@ class GuiScreen;
 
 class Widget {
 public:
-	enum {
+	enum : uint {
 		DIRTY_NONE = 0,
 		DIRTY_ALL = 0xFFFFFFFF
 	};


Commit: 29004bee916cf75edca8289522eb861fa94737f7
    https://github.com/scummvm/scummvm/commit/29004bee916cf75edca8289522eb861fa94737f7
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
NEVERHOOD: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/neverhood/gamevars.h


diff --git a/engines/neverhood/gamevars.h b/engines/neverhood/gamevars.h
index 88e485ce964..bdc44f14a2c 100644
--- a/engines/neverhood/gamevars.h
+++ b/engines/neverhood/gamevars.h
@@ -28,7 +28,7 @@
 
 namespace Neverhood {
 
-enum {
+enum : uint {
 	// Misc
 	V_MODULE_NAME				= 0x91080831,			// Currently active module name hash
 	V_CURRENT_SCENE				= 0x108A4870,			// Current scene in the current module


Commit: 93502a71ed0644164c807b7dd3203572941cb965
    https://github.com/scummvm/scummvm/commit/93502a71ed0644164c807b7dd3203572941cb965
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
PARALLACTION: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/parallaction/objects.h


diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h
index 6d4d3b934a4..d3121765747 100644
--- a/engines/parallaction/objects.h
+++ b/engines/parallaction/objects.h
@@ -92,7 +92,7 @@ enum ZoneFlags {
 };
 
 
-enum CommandFlags {
+enum CommandFlags : uint {
 	kFlagsAll			= 0xFFFFFFFFU,
 
 	kFlagsVisited		= 1,


Commit: 25842987ef73c5f4e28fc013ce63fce1e53c9b5f
    https://github.com/scummvm/scummvm/commit/25842987ef73c5f4e28fc013ce63fce1e53c9b5f
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
SCI: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/sci/engine/script.h


diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h
index 13c441d071c..64c2255017e 100644
--- a/engines/sci/engine/script.h
+++ b/engines/sci/engine/script.h
@@ -55,7 +55,7 @@ enum ScriptOffsetEntryTypes {
 	SCI_SCR_OFFSET_TYPE_SAID
 };
 
-enum {
+enum : uint {
 	kNoRelocation = 0xFFFFFFFF
 };
 


Commit: 030f104c120b750dbd99429eb20a4b8a417d968e
    https://github.com/scummvm/scummvm/commit/030f104c120b750dbd99429eb20a4b8a417d968e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:55+01:00

Commit Message:
SCUMM: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/scumm/he/wiz_he.h
    engines/scumm/resource.h


diff --git a/engines/scumm/he/wiz_he.h b/engines/scumm/he/wiz_he.h
index 91049e7ab3d..6fc2fcab0f6 100644
--- a/engines/scumm/he/wiz_he.h
+++ b/engines/scumm/he/wiz_he.h
@@ -203,7 +203,7 @@ enum WizCompositeFlags {
 	kWCFSubConditionBits = 0x20
 };
 
-enum WizSpcConditionTypes {
+enum WizSpcConditionTypes : uint {
 	kWSPCCTBits = 0xc0000000,
 	kWSPCCTOr   = 0x00000000,
 	kWSPCCTAnd  = 0x40000000,
diff --git a/engines/scumm/resource.h b/engines/scumm/resource.h
index 6f9c09017a9..68fc01ca42d 100644
--- a/engines/scumm/resource.h
+++ b/engines/scumm/resource.h
@@ -44,7 +44,7 @@ public:
 	const byte *findNext(uint32 tag);
 };
 
-enum {
+enum : uint {
 	RES_INVALID_OFFSET = 0xFFFFFFFF
 };

More information about the Scummvm-git-logs mailing list