[Scummvm-git-logs] scummvm master -> 9c65b016da2d33441fcf70c1bf64e6f2d856ac07

[fracturehill]

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:
1118fb0e5f DEVTOOLS: Fix nancy2 softlock fix in create_nancy
9c65b016da DISTS: Update nancy.dat


Commit: 1118fb0e5fff9078fe637014815b517b33c4a129
    https://github.com/scummvm/scummvm/commit/1118fb0e5fff9078fe637014815b517b33c4a129
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-11-19T23:22:00+02:00

Commit Message:
DEVTOOLS: Fix nancy2 softlock fix in create_nancy

The softlock fix in nancy2 actually introduced a different
softlock instead; this commit fixes it.

Changed paths:
    devtools/create_nancy/files/nancy2/S1160.cif


diff --git a/devtools/create_nancy/files/nancy2/S1160.cif b/devtools/create_nancy/files/nancy2/S1160.cif
index df829a48cd0..89d6f38602e 100644
Binary files a/devtools/create_nancy/files/nancy2/S1160.cif and b/devtools/create_nancy/files/nancy2/S1160.cif differ


Commit: 9c65b016da2d33441fcf70c1bf64e6f2d856ac07
    https://github.com/scummvm/scummvm/commit/9c65b016da2d33441fcf70c1bf64e6f2d856ac07
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-11-19T23:22:00+02:00

Commit Message:
DISTS: Update nancy.dat

This includes a proper fix for the nancy2 softlock, as well as
a correction for which scenes need to be affected when
"fix softlocks" is enabled in nancy5

Changed paths:
    dists/engine-data/nancy.dat


diff --git a/dists/engine-data/nancy.dat b/dists/engine-data/nancy.dat
index 1ceb6a9c9f0..796f7597972 100644
Binary files a/dists/engine-data/nancy.dat and b/dists/engine-data/nancy.dat differ