[Scummvm-git-logs] scummvm master -> 9509db076b21028f57ccb85ae07274722e2b25a3

[djsrv]

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

Summary:
9509db076b DIRECTOR: Remove FileVersion type name


Commit: 9509db076b21028f57ccb85ae07274722e2b25a3
    https://github.com/scummvm/scummvm/commit/9509db076b21028f57ccb85ae07274722e2b25a3
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-19T14:05:02-04:00

Commit Message:
DIRECTOR: Remove FileVersion type name

File versions aren't constrained to the values in the enum, they can be
any uint16. The enum just contains major versions, and it doesn't make
much sense to treat it as an independent type.

Changed paths:
    engines/director/cast.cpp
    engines/director/images.cpp
    engines/director/images.h
    engines/director/types.h


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 1cf25d8caa..080ef37168 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -563,7 +563,7 @@ void Cast::loadCastChildren() {
 
 			if (w > 0 && h > 0) {
 				if (_version < kFileVer600) {
-					img = new BITDDecoder(w, h, bitmapCast->_bitsPerPixel, bitmapCast->_pitch, _vm->getPalette(), static_cast<FileVersion>(_version));
+					img = new BITDDecoder(w, h, bitmapCast->_bitsPerPixel, bitmapCast->_pitch, _vm->getPalette(), _version);
 				} else {
 					img = new Image::BitmapDecoder();
 				}
diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index db61dd265e..50e8344538 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -104,7 +104,7 @@ bool DIBDecoder::loadStream(Common::SeekableReadStream &stream) {
 * BITD
 ****************************/
 
-BITDDecoder::BITDDecoder(int w, int h, uint16 bitsPerPixel, uint16 pitch, const byte *palette, FileVersion version) {
+BITDDecoder::BITDDecoder(int w, int h, uint16 bitsPerPixel, uint16 pitch, const byte *palette, uint16 version) {
 	_surface = new Graphics::Surface();
 	_pitch = pitch;
 	_version = version;
diff --git a/engines/director/images.h b/engines/director/images.h
index 3b2b082a77..e61a69f9aa 100644
--- a/engines/director/images.h
+++ b/engines/director/images.h
@@ -61,7 +61,7 @@ private:
 
 class BITDDecoder : public Image::ImageDecoder {
 public:
-	BITDDecoder(int w, int h, uint16 bitsPerPixel, uint16 pitch, const byte *palette, FileVersion version);
+	BITDDecoder(int w, int h, uint16 bitsPerPixel, uint16 pitch, const byte *palette, uint16 version);
 	~BITDDecoder() override;
 
 	// ImageDecoder API
@@ -78,7 +78,7 @@ private:
 	const byte *_palette;
 	uint8 _paletteColorCount;
 	uint16 _bitsPerPixel;
-	FileVersion _version;
+	uint16 _version;
 	uint16 _pitch;
 };
 
diff --git a/engines/director/types.h b/engines/director/types.h
index 4cfb475051..863e8485b4 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -317,7 +317,7 @@ enum ChunkType {
 	kChunkLine
 };
 
-enum FileVersion {
+enum {
 	kFileVer300 = 0x404,
 	kFileVer310 = 0x405,
 	kFileVer400 = 0x45B,