[Scummvm-git-logs] scummvm master -> 74c9b5365e11001ca23d8e1d803e4a693ed2c3c0

sev- noreply at scummvm.org
Thu Jun 26 23:02:30 UTC 2025


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

Summary:
74c9b5365e DIRECTOR: Remove unnecessary chunk.h file


Commit: 74c9b5365e11001ca23d8e1d803e4a693ed2c3c0
    https://github.com/scummvm/scummvm/commit/74c9b5365e11001ca23d8e1d803e4a693ed2c3c0
Author: Malhar (themalharbdv2046 at gmail.com)
Date: 2025-06-27T01:02:26+02:00

Commit Message:
DIRECTOR: Remove unnecessary chunk.h file

Originally intended to be used for saving Chunk data into structs
Idea scrapped since then since it doesn't provide any value

Changed paths:
  R engines/director/chunk.h
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index c3144a4f42d..1ab1822b5f9 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -33,7 +33,6 @@
 
 #include "director/director.h"
 #include "director/cast.h"
-#include "director/chunk.h"
 #include "director/movie.h"
 #include "director/rte.h"
 #include "director/score.h"
diff --git a/engines/director/chunk.h b/engines/director/chunk.h
deleted file mode 100644
index 24140747c08..00000000000
--- a/engines/director/chunk.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-#ifndef DIRECTOR_CHUNK_H
-#define DIRECTOR_CHUNK_H
-
-namespace Common {
-struct Rect;
-class SeekableReadStreamEndian;
-class SeekableMemoryWriteStream;
-}
-
-namespace Director {
-
-class Archive;
-
-enum ArchiveChunkType {
-	kCastChunk,
-	// kCastListChunk,
-	// kCastMemberChunk,
-	// kCastInfoChunk,
-	kConfigChunk,
-	// kInitialMapChunk,
-	// kKeyTableChunk,
-	// kMemoryMapChunk,
-	// kScriptChunk,
-	// kScriptContextChunk,
-	// kScriptNamesChunk
-};
-
-struct Chunk {
-	Archive *dir;
-	ArchiveChunkType _chunkType;
-	bool _writable;
-
-	Chunk(Archive *d, ArchiveChunkType t) : dir(d), _chunkType(t), _writable(false) {}
-	virtual ~Chunk() = default;
-	virtual void read(Common::SeekableReadStreamEndian &stream) = 0;
-	virtual uint16 size() { return 0; }
-	virtual void write(Common::SeekableMemoryWriteStream&) {}
-
-};
-
-struct ConfigChunk : Chunk {
-	/*  0 */ uint16 len;
-	/*  2 */ uint16 fileVersion;
-	/*  4, 6, 8, 10 */ Common::Rect checkRect;
-    /* 12 */ uint16 castArrayStart;
-	/* 14 */ uint16 castArrayEnd;
-	/* 16 */ byte readRate;
-	/* 17 */ byte lightswitch;
-
-	// Director 6 and below
-		/* 18 */ int16 unk1;	// Mentioned in ProjectorRays as preD7field11
-
-	// Director 7 and above
-	// Currently not supporting Director 7
-		// /* 18 */ int8 D7stageColorG;
-		// /* 19 */ int8 D7stageColorB;
-
-	/* 20 */ uint16 commentFont;
-	/* 22 */ uint16 commentSize;
-	/* 24 */ uint16 commentStyle;
-
-	// Director 6 and below
-		/* 26 */ uint16 stageColor;
-	// Director 7 and above
-	// Currently not supporting Director 7
-		// /* 26 */ uint8 D7stageColorIsRGB;
-		// /* 27 */ uint8 D7stageColorR;
-
-	/* 28 */ uint16 bitdepth;
-	/* 30 */ uint8 field17;
-	/* 31 */ uint8 field18;
-	/* 32 */ int32 field19;
-	/* 36 */ int16 directorVersion;
-	/* 38 */ int16 field21;
-	/* 40 */ int32 field22;
-	/* 44 */ int32 field23;
-	/* 48 */ int32 field24;
-	/* 52 */ int8 field25;
-	/* 53 */ uint8 field26;
-	/* 54 */ int16 frameRate;
-	/* 56 */ int16 platform;
-	/* 58 */ int16 protection;
-	/* 60 */ int32 field29;
-	/* 64 */ uint32 checksum;
-	/* 68 */ uint16 field30;	// Marked as remnants in ProjectorRays
-
-	ConfigChunk(Archive *m) : Chunk(m, kConfigChunk) {
-		_writable = true;
-	}
-	void read(Common::SeekableReadStreamEndian &stream) {}
-	uint16 size() { return len; }
-	void write(Common::SeekableMemoryWriteStream &stream) {}
-	uint32 computeChecksum() { return 0; }
-};
-
-}   // End of namespace Director
-
-#endif




More information about the Scummvm-git-logs mailing list