[Scummvm-git-logs] scummvm master -> bfcf55f609b6dd4e415599cda65885aaf1911efd

[bluegr]

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

Summary:
a9015fb351 COMMON: Add error description for kMetaEnginePluginNotFound
bfcf55f609 JANITORIAL: Reformat


Commit: a9015fb35143e898643bc64ae80b12dd03c6bf88
    https://github.com/scummvm/scummvm/commit/a9015fb35143e898643bc64ae80b12dd03c6bf88
Author: tunnelsociety (150493071+tunnelsociety at users.noreply.github.com)
Date: 2025-05-31T11:30:32+03:00

Commit Message:
COMMON: Add error description for kMetaEnginePluginNotFound

It *can* happen (for example, when built with --disable-detection-full).

Changed paths:
    common/error.cpp
    common/error.h


diff --git a/common/error.cpp b/common/error.cpp
index 6f7476a1f77..ffe8f2af5cd 100644
--- a/common/error.cpp
+++ b/common/error.cpp
@@ -64,6 +64,7 @@ static String errorToString(ErrorCode errorCode) {
 		return _s("Writing data failed");
 
 	case kEnginePluginNotFound:
+	case kMetaEnginePluginNotFound:
 		return _s("Could not find suitable engine plugin");
 	case kEnginePluginNotSupportSaves:
 		return _s("Engine plugin does not support saved games");
diff --git a/common/error.h b/common/error.h
index 476c0c8839f..864a80f6040 100644
--- a/common/error.h
+++ b/common/error.h
@@ -62,11 +62,7 @@ enum ErrorCode {
 	kReadingFailed,				///< Failed to read a file (permission denied?).
 	kWritingFailed,				///< Failure to write data - disk full?
 
-	/** Failed to find a MetaEnginePlugin. This should never happen, because all MetaEngines must always
-	 * be built into the executable, regardless if the engine plugins are present or not.
-	 */
-	kMetaEnginePluginNotFound,
-
+	kMetaEnginePluginNotFound,	///< Failed to find a MetaEnginePlugin.
 	kEnginePluginNotFound,		///< Failed to find an Engine plugin to handle target.
 	kEnginePluginNotSupportSaves,	///< The plugin does not support listing save states.
 


Commit: bfcf55f609b6dd4e415599cda65885aaf1911efd
    https://github.com/scummvm/scummvm/commit/bfcf55f609b6dd4e415599cda65885aaf1911efd
Author: tunnelsociety (150493071+tunnelsociety at users.noreply.github.com)
Date: 2025-05-31T11:30:32+03:00

Commit Message:
JANITORIAL: Reformat

Changed paths:
    common/error.h


diff --git a/common/error.h b/common/error.h
index 864a80f6040..2b2b8a05144 100644
--- a/common/error.h
+++ b/common/error.h
@@ -45,30 +45,31 @@ namespace Common {
  * @todo Adjust all error codes to comply with these conventions.
  */
 enum ErrorCode {
-	kNoError = 0,				///< No error occurred.
-	kNoGameDataFoundError,		///< Engine initialization: No game data was found in the specified location.
-	kUnsupportedGameidError,	///< Engine initialization: Game ID not supported by this (Meta)Engine.
-	kUnsupportedColorMode,		///< Engine initialization: Engine does not support backend's color mode.
-	kAudioDeviceInitFailed,		///< Engine initialization: Audio device initialization failed.
+	kNoError = 0,					///< No error occurred.
 
-	kReadPermissionDenied,		///< Unable to read data due to missing read permission.
-	kWritePermissionDenied,		///< Unable to write data due to missing write permission.
+	kNoGameDataFoundError,			///< Engine initialization: No game data was found in the specified location.
+	kUnsupportedGameidError,		///< Engine initialization: Game ID not supported by this (Meta)Engine.
+	kUnsupportedColorMode,			///< Engine initialization: Engine does not support backend's color mode.
+	kAudioDeviceInitFailed,			///< Engine initialization: Audio device initialization failed.
 
-	kPathDoesNotExist,			///< The specified path does not exist.
-	kPathNotDirectory,			///< The specified path does not point to a directory.
-	kPathNotFile,				///< The specified path does not point to a file.
+	kReadPermissionDenied,			///< Unable to read data due to missing read permission.
+	kWritePermissionDenied,			///< Unable to write data due to missing write permission.
 
-	kCreatingFileFailed,		///< Failed creating a (savestate) file.
-	kReadingFailed,				///< Failed to read a file (permission denied?).
-	kWritingFailed,				///< Failure to write data - disk full?
+	kPathDoesNotExist,				///< The specified path does not exist.
+	kPathNotDirectory,				///< The specified path does not point to a directory.
+	kPathNotFile,					///< The specified path does not point to a file.
 
-	kMetaEnginePluginNotFound,	///< Failed to find a MetaEnginePlugin.
-	kEnginePluginNotFound,		///< Failed to find an Engine plugin to handle target.
+	kCreatingFileFailed,			///< Failed creating a (savestate) file.
+	kReadingFailed,					///< Failed to read a file (permission denied?).
+	kWritingFailed,					///< Failure to write data - disk full?
+
+	kMetaEnginePluginNotFound,		///< Failed to find a MetaEnginePlugin.
+	kEnginePluginNotFound,			///< Failed to find an Engine plugin to handle target.
 	kEnginePluginNotSupportSaves,	///< The plugin does not support listing save states.
 
-	kUserCanceled,			///< User has canceled the launching of the game.
+	kUserCanceled,					///< User has canceled the launching of the game.
 
-	kUnknownError				///< Catch-all error, used if no other error code matches.
+	kUnknownError					///< Catch-all error, used if no other error code matches.
 };
 
 /**