KEMBAR78
AGS: Commits from upstream up to version 3.6.0.48 by tag2015 · Pull Request #4975 · scummvm/scummvm · GitHub
Skip to content

Conversation

@tag2015
Copy link
Contributor

@tag2015 tag2015 commented May 4, 2023

This PR adds the commits from upstream up to version 3.6.0.48, which is the first "patch" release
of the 3.6.0 branch.

As the branch is now considered stable, the changes are just minor bugfixes.

SKIPPED COMMITS:

Engine: fixed <3.6.0 Animate functions default volume parameter
Already merged

Engine: fixed BytesPerSample() incorrectly returning bits per sample
Not present

tag2015 added 10 commits May 3, 2023 10:57
…xture

Firstly, this is not necessarily optimal, as the next graphic
assigned to these objects may be of same size, in which case
the texture surface may be reused.

But there's another thing: there've been a bogus behavior in
the AGS, where a dynamic sprite, deleted right before the
room's exit transition, was still displayed for room objects (and
everything else really).
This is because although the sprite was disposed, the image
remained on a texture connected to these objects, at least
until the next object update. But object updates don't run
during room transitions, hence the effect.
From upstream 38d0dd3d7f0d6a4624d1f908f2e8d3c1abfee52a
Historically, this function could *happen* to create bitmaps of
0x0 or even -1x-1 sizes and return a valid DynamicSprite
object. Try to ensure the image library is passed valid
parameters in such case, and keep going, for backwards compatibility.
From upstream 82194b261b4649281742c45498a4c34f452fd350
…pes"

From upstream 8d1751508b7f7d9925931144de1e3cb8ed1d2f51
* Fixed _lastAliveTs was not reset right after calling sys_evt_process_pending();
this caused events polling called continuously after timeout happened once.
* Set timeout to 60 fps (16.777 ms) instead of random 10ms.
* Do the timeout test only each 1000th loop iteration.
* Few other tiny adjustments in code.

Partially from upstream 60aaef003021fec2f75d4dc6db1b24f0b5d2be65
From upstream 57e866411b77af9e3a942bccf4a8c59bfa3d12cd
From upstream dd50a9976f77d504952171209c1597483318e1c2
…exture

This mistake was introduced early on in 7ed5186 and not fixed still in the later fix 38d0dd3
From upstream 1f27837ef14585d8050a4b49b46faa002f87a881
…e data

This complements the original idea, but also as a side-effect fixes a mistake introduced by another hotfix 38d0dd3.
Because the ID remained intact in the texture, the engine would not know to stop using it and replace after a dynamic sprite was deleted.
From upstream 87cc8e099169b82c2393282921e4d8295af4d0a9
From upstream c694126d77503b9d5528bd95427a8ef6ee48aa6c
Partially from upstream ad45540abe6c776574e02e6e57fba7758410ec40
@sev-
Copy link
Member

sev- commented May 14, 2023

Thank you!

@sev- sev- merged commit 8d08d05 into scummvm:master May 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants