DIRECTOR: Fix sprite position setting #5074
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In original engine it is possible to set non-puppted sprite properties like position, backcolor etc and then call updatestage to update the screen according to property. This is undocumented behaviour which is not present depicted in any books however with rigorous testing it is found to be true. This change only persist for the current frame and once the playback head is moving the change is lost. `ATD\HD\bdDREAMA.DXR` of 'totaldistortion' used some of this quirk to display moving bullets.
hari01584
force-pushed
the
total_distortion_gunbug
branch
from
a00a56c
to
4f294c8
Compare
sev-
requested changes
Jun 9, 2023
engines/director/sprite.cpp
Outdated
| @@ -62,6 +62,8 @@ Sprite::Sprite(Frame *frame) { | |||
| _moveable = false; | |||
| _editable = false; | |||
| _puppet = false; | |||
| if (g_director->getVersion() >= 600) | |||
There was a problem hiding this comment.
This is incorrect. You already setting this flag in the individual places where we change properties.
With this code, you blindly assign autopuppet to any non-puppet sprite.
engines/director/score.cpp
Outdated
| @@ -564,6 +564,7 @@ void Score::renderFrame(uint16 frameId, RenderMode mode) { | |||
| setLastPalette(frameId); | |||
| renderSprites(frameId, mode); | |||
| _window->render(); | |||
| resetNonPuppetSprites(frameId); | |||
There was a problem hiding this comment.
Please explain why are you doing this? I thought, that this reset is happening in Channel::setClean()
if (_sprite->_puppet || (!nextSprite->isQDShape() && partial)) {
// Updating scripts, etc. does not require a full re-render
_sprite->_scriptId = nextSprite->_scriptId;
} else {
previousCastId = _sprite->_castId;
replaceSprite(nextSprite);
}e.g. we are not touching puppetized sprites
engines/director/channel.cpp
Outdated
| @@ -537,24 +555,47 @@ void Channel::replaceSprite(Sprite *nextSprite) { | |||
| } | |||
| } | |||
|
|
|||
| void Channel::setNonChangedSprite(Sprite *nextSprite) { | |||
There was a problem hiding this comment.
What is the prurpose of it? Looks like a dirty hack or no reason. You should not check the positions like this.
hari01584
force-pushed
the
total_distortion_gunbug
branch
from
01ed8e4
to
f1a9115
Compare
[Based on Director in a Nutshell, page 15] The following properties of a sprite are auto-puppeted whenever the property is set: backColor, blend, editable, foreColor, height, ink, loc, locH, locV, member, moveable, rect and width. Auto-puppeting of individual properties has no effect on the puppet of sprite property ['Lingo Dictionary' 601 Fixes] Sprites now have a duration as specified in the (new) score view. When lingo modifies any of the sprite properties that property will be auto-puppeted, i.e. the value set will stick for the duration of that sprite despite any values recorded in the score. This can cause existing lingo which relied on setting the property of a sprite without the use of 'puppet' to behave differently. Calling 'puppetSprite spriteNumber, FALSE' will also clear any currently auto-puppeted properties.
hari01584
force-pushed
the
total_distortion_gunbug
branch
from
f1a9115
to
bdc7ab9
Compare
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Self explanatory, do not merge, WIP.