[Scummvm-git-logs] scummvm master -> f09cfc83d5a75719efca008a57255da407fba8d3
sev-
noreply at scummvm.org
Mon Jun 3 18:30:42 UTC 2024
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5406770710 DIRECTOR: Added some archive format notes
f09cfc83d5 GUI: Put the help button back to [?]
Commit: 54067707106e4bbd536f8469585c0cccfe13e696
https://github.com/scummvm/scummvm/commit/54067707106e4bbd536f8469585c0cccfe13e696
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-06-03T20:30:20+02:00
Commit Message:
DIRECTOR: Added some archive format notes
Changed paths:
engines/director/archive.cpp
diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 37f7bd6f4d3..22d2cb5af51 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -461,7 +461,7 @@ bool RIFFArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
uint32 cftcSize = stream->readUint32LE();
uint32 startPos = stream->pos();
- stream->readUint32LE(); // unknown (always 0?)
+ stream->readUint32LE(); // Chunk number, alsways 0
Common::DumpFile out;
@@ -778,7 +778,7 @@ bool RIFXArchive::readMemoryMap(Common::SeekableReadStreamEndian &stream, uint32
_types[MKTAG('i', 'm', 'a', 'p')][0].accessed = true; // Mark it as accessed
stream.readUint32(); // imap length
- stream.readUint32(); // unknown
+ uint32 mapversion = stream.readUint32(); // version, seen 0 or 1
uint32 mmapOffsetPos = stream.pos();
uint32 mmapOffset = stream.readUint32() + moreOffset;
if (dumpStream) {
@@ -790,7 +790,7 @@ bool RIFXArchive::readMemoryMap(Common::SeekableReadStreamEndian &stream, uint32
dumpStream->writeUint32LE(mmapOffset - movieStartOffset);
}
uint32 version = stream.readUint32(); // 0 for 4.0, 0x4c1 for 5.0, 0x4c7 for 6.0, 0x708 for 8.5, 0x742 for 10.0
- warning("mmap: version: %x offset: 0x%x (%d)", version, mmapOffset, mmapOffset);
+ warning("mmap: mapversion: %d version: %x offset: 0x%x (%d)", mapversion, version, mmapOffset, mmapOffset);
stream.seek(mmapOffset);
@@ -802,8 +802,8 @@ bool RIFXArchive::readMemoryMap(Common::SeekableReadStreamEndian &stream, uint32
_types[MKTAG('m', 'm', 'a', 'p')][0].accessed = true; // Mark it as accessed
stream.readUint32(); // mmap length
- stream.readUint16(); // unknown
- stream.readUint16(); // unknown
+ stream.readUint16(); // header size
+ stream.readUint16(); // size of map entry
stream.readUint32(); // resCount + empty entries
uint32 resCount = stream.readUint32();
stream.skip(8); // all 0xFF
Commit: f09cfc83d5a75719efca008a57255da407fba8d3
https://github.com/scummvm/scummvm/commit/f09cfc83d5a75719efca008a57255da407fba8d3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-06-03T20:30:20+02:00
Commit Message:
GUI: Put the help button back to [?]
The "Help" inscription was too wide for vertical mobile layout.
This effectively reverts 4b51ee1f98d222fb13092bab50a90a311dadce43
Changed paths:
gui/launcher.cpp
gui/themes/common/highres_layout.stx
gui/themes/common/lowres_layout.stx
gui/themes/default.inc
gui/themes/residualvm.zip
gui/themes/scummclassic.zip
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
gui/themes/scummmodern.zip
gui/themes/scummremastered.zip
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 5e32333aaa5..14d3169d28e 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -259,7 +259,7 @@ void LauncherDialog::build() {
#endif
new StaticTextWidget(this, _title + ".Version", Common::U32String(gScummVMFullVersion));
- new ButtonWidget(this, _title + ".HelpButton", Common::U32String("Help"), _("Click here to see Help"), kHelpCmd);
+ new ButtonWidget(this, _title + ".HelpButton", Common::U32String("?"), _("Click here to see Help"), kHelpCmd);
if (!g_system->hasFeature(OSystem::kFeatureNoQuit)) {
// I18N: Button Quit ScummVM program. Q is the shortcut, Ctrl+Q, put it in parens for non-latin (~Q~)
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 842d7ec8f45..cc8da14ed0c 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -47,7 +47,7 @@
<def var = 'ShowChooserPics' value = '1'/>
<def var = 'ShowChooserPageDisplay' value = '1'/>
- <def var = 'Launcher.HelpButton.Width' value = '72' scalable = 'yes'/> <!-- Button.Width * 3 -->
+ <def var = 'Launcher.HelpButton.Width' value = '24' scalable = 'yes'/> <!-- Button.Width * 3 -->
<def var = 'SaveLoadChooser.ExtInfo.Visible' value = '1'/>
<def var = 'RecorderDialog.ExtInfo.Visible' value = '1'/>
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index 732fa05caac..f2c1a2d2c37 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -39,7 +39,7 @@
<def var = 'ShowChooserPics' value = '0'/>
<def var = 'ShowChooserPageDisplay' value = '0'/>
- <def var = 'Launcher.HelpButton.Width' value = '48' scalable = 'yes'/> <!-- Button.Width * 3 -->
+ <def var = 'Launcher.HelpButton.Width' value = '16' scalable = 'yes'/> <!-- Button.Width -->
<def var = 'SaveLoadChooser.ExtInfo.Visible' value = '0'/>
<def var = 'RecorderDialog.ExtInfo.Visible' value = '0'/>
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index cc53c177be0..8036fb6153a 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1453,7 +1453,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<def var='ShowSearchPic' value='0'/>"
"<def var='ShowChooserPics' value='0'/>"
"<def var='ShowChooserPageDisplay' value='1'/>"
-"<def var='Launcher.HelpButton.Width' value='72' scalable='yes'/> "
+"<def var='Launcher.HelpButton.Width' value='24' scalable='yes'/> "
"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/>"
"<def var='RecorderDialog.ExtInfo.Visible' value='1'/>"
"<def var='ImageAlbum.ImageInset' value='16' scalable='yes' />"
@@ -3750,7 +3750,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<def var='ShowSearchPic' value='0'/>"
"<def var='ShowChooserPics' value='0'/>"
"<def var='ShowChooserPageDisplay' value='0'/>"
-"<def var='Launcher.HelpButton.Width' value='48' scalable='yes'/> "
+"<def var='Launcher.HelpButton.Width' value='16' scalable='yes'/> "
"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/>"
"<def var='RecorderDialog.ExtInfo.Visible' value='0'/>"
"<def var='ImageAlbum.ImageInset' value='16' scalable='yes' />"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index eb2429c93e0..cd6ddb5183e 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 40fcaa32f7e..c91194030f2 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index b6e1ba97589..4364024520c 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -39,7 +39,7 @@
<def var = 'ShowChooserPics' value = '0'/>
<def var = 'ShowChooserPageDisplay' value = '1'/>
- <def var = 'Launcher.HelpButton.Width' value = '72' scalable = 'yes'/> <!-- Button.Width * 3 -->
+ <def var = 'Launcher.HelpButton.Width' value = '24' scalable = 'yes'/> <!-- Button.Width -->
<def var = 'SaveLoadChooser.ExtInfo.Visible' value = '1'/>
<def var = 'RecorderDialog.ExtInfo.Visible' value = '1'/>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 1e160680d79..22cf2191baa 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -39,7 +39,7 @@
<def var = 'ShowChooserPics' value = '0'/>
<def var = 'ShowChooserPageDisplay' value = '0'/>
- <def var = 'Launcher.HelpButton.Width' value = '48' scalable = 'yes'/> <!-- Button.Width * 3 -->
+ <def var = 'Launcher.HelpButton.Width' value = '16' scalable = 'yes'/> <!-- Button.Width -->
<def var = 'SaveLoadChooser.ExtInfo.Visible' value = '0'/>
<def var = 'RecorderDialog.ExtInfo.Visible' value = '0'/>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index ac81bc9ddff..e9eb879700a 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index fe542ca3323..c0a4c51e235 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
More information about the Scummvm-git-logs
mailing list