119944 Commits

Author SHA1 Message Date
ysj1173886760
be199c07ab DIRECTOR: more precise definition for shouldHilite for D3 2021-06-30 16:29:00 +02:00
ysj1173886760
506ee5200a DIRECTOR: removing changing original sprites when setting cast member. 2021-06-30 16:29:00 +02:00
ysj1173886760
1d20fa758f DIRECTOR: don't hilite puppet sprites. 2021-06-30 16:29:00 +02:00
ysj1173886760
b2ea651b9d DIRECTOR: auto expand text widgets for D3/4 2021-06-30 16:29:00 +02:00
ysj1173886760
c759e27fe7 GRAPHICS: MACGUI: introduce _fixedDims to mactext, which represent for whether mactext should auto expanding. 2021-06-30 16:29:00 +02:00
ysj1173886760
7eb039d174 DIRECTOR: fix intersect check. add 1 offset for constrain boundary 2021-06-30 16:29:00 +02:00
ysj1173886760
4a38579f44 DIRECTOR: don't regard quick draw shape as matte type 2021-06-30 16:29:00 +02:00
ysj1173886760
7c147b16fb DIRECTOR: support QDshape matte for intersect and within check 2021-06-30 16:29:00 +02:00
ysj1173886760
d46866f893 DIRECTOR: implement matte for quick draw shape 2021-06-30 16:29:00 +02:00
ysj1173886760
ced3a58b10 DIRECTOR: fix setting width and height to puppet sprites 2021-06-30 16:29:00 +02:00
ysj1173886760
787454f908 GRAPHICS: MACGUI: support partial color setting in mactext 2021-06-30 16:29:00 +02:00
ysj1173886760
ba9f97df4d DIRECTOR: fix setting color for text castmember 2021-06-30 16:29:00 +02:00
ysj1173886760
ba858522eb GRAPHICS: MACGUI: add basic color changing support for mactext 2021-06-30 16:29:00 +02:00
ysj1173886760
6db3b93050 GRAPHICS: MACGUI: add an overload version for findBestColor 2021-06-30 16:29:00 +02:00
ysj1173886760
b512f33263 GRAPHICS: MACGUI: pass an event of lbutton_up to those widgets should clear widgets correctly. 2021-06-30 16:29:00 +02:00
ysj1173886760
1359be17be DIRECTOR: clear the events when we are calling MessageDialog box in b_alert. 2021-06-30 16:29:00 +02:00
ysj1173886760
bb26ca4d46 GRAPHICS: MACGUI: reset variable for handling events for macwidgets when wm won't handle events correctly 2021-06-30 16:29:00 +02:00
ysj1173886760
dc6dd68776 DIRECTOR: change the original sprite when we are setting cast num 2021-06-30 16:29:00 +02:00
VAN-Gluon
72c3ef774e I18N: Update translation (Japanese)
Currently translated at 100.0% (1649 of 1649 strings)
2021-06-30 13:44:26 +00:00
Timo Mikkolainen
0b3e847635 I18N: Update translation (Finnish)
Currently translated at 100.0% (1649 of 1649 strings)
2021-06-30 13:44:25 +00:00
IlDucci
af12fd27d8 I18N: Update translation (Spanish)
Currently translated at 100.0% (1649 of 1649 strings)
2021-06-30 13:44:09 +00:00
peres
43ef9297b5 PARALLACTION: force palette update for BRA COLOR instruction.
The COLOR instruction does simple palette animation; it is visible
in several places, e.g. the windows in the train in part 3.
2021-06-30 22:11:53 +09:00
ScummVM-Translations
bd6ab205b9 I18N: Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: ScummVM/scummvm
Translate-URL: https://translations.scummvm.org/projects/scummvm/scummvm/
2021-06-30 13:11:01 +00:00
Torbjörn Andersson
aa30776d61 NEWS: Added note about font support in the Mac version of Indy3 2021-06-30 15:10:20 +02:00
ScummVM-Translations
c3d5a9d2b8 I18N: Update translations templates 2021-06-30 13:00:05 +00:00
Torbjörn Andersson
5f2bf42f84 SCUMM: Changed the workaround for verbs drawn in room 80
It turns out that checking the room height causes verbs not to be
redrawn after reading books. Let's just limit it to room 80, and hope
there aren't any other cases.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
0de3b584ea SCUMM: Fix Indy 3 Mac credits with the low resolution font
This is based on the DOS VGA version. I would have been more comfortable
comparing it to the EGA version, but I don't have that. But from what I
can tell, it should work the same.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
e275b07e00 SCUMM: Fix thinko in CharsetRendererMac::getFontHeight()
It should only return the actual font height for Indy 3's font 1, and
even there it's not actually needed at the moment. I'm guessing this
error is why I saw some text rendering errors in Mac Loom, where lines
of text were spaced too far apart. Though strangely, I never managed to
reproduce it.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
87f61b3589 SCUMM: Clarified comment about credits glitch workaround
For some reason that I can't be bothered to investigate, it only works
with the high-resolution font. Which is what you should be using anyway.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
276381dac2 SCUMM: Work around problem with inactive verbs being drawn in a scene
There is at least one scene in the game where inactive verbs are drawn,
and then the scene background is drawn over them. This should mean the
verbs are no longer visible, but the way we implement high-resolution
text on a scaled low-resolution background all text is assumed to have a
text mask on the text surface.

We work around this by only drawin verbs in standard rooms, where
"standard" is defined as being 128 pixels tall.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
1c352471bd SCUMM: Clear the credits between each text screen in Indy 3 Mac
I don't see anything in the script that would do it (well, there is one
but that may be just an accidental leftover from the DOS version), so
trigger on the end of each delay throughout the credits script.

Pretty? No, I guess not. But it's at the end of the game, so there
should be no risk of it messing things up.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
985463cfd0 SCUMM: Make the Indy 3 Mac fix a bit more specific
I don't know if there can ever be any confusion, but check that it's a
global script that's called, just to be safe.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
3f66ef36ac SCUMM: Eliminate strlen() to fix code analysis warning
Instead of looping through the entire string, loop until the end of the
string or until the rendered string gets too wide for the text box. The
upper limit is somewhat arbitrarily chosen, but should look fine if an
actor name is ever that long. (Hint: They're not.)
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
aac9b8296d SCUMM: Remove font 1 warning. It has served its purpose.
My conclusion is that font 0 and font 1 are the same font in the Mac
version. In the DOS version, font 1 is a bolder font.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
6fe09c2cba SCUMM: Added Indy 3 Mac high-resolution cursor
Unlike Loom, there is apparently no cursor resource for this, so I'm
simply hard-coding it.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
5b2ca72a32 SCUMM: Fix leftover verbs when giving objects to other characters
It looks like the input script - or at least this particular input
script - expects to be called twice. Once to clear the verbs and once
for the recipient to accept/reject your offer. In the 256-color DOS
version, both of these are done during the same call.

I don't know if this applies to other input scripts as well, but I'm
limiting it to this one for now.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
671a169153 SCUMM: Fix inventory problem when offering items to other characters.
If you offered an object to someone, e.g. one of the guards at Castle
Brunwald, then clicked "Never mind" instead, the next time you tried you
would only see one inventory object. This seems to be because unlike the
DOS version (at least the 256-color version), script 12 only enables
verb 101, not the whole inventory.

Perhaps the Mac version treated the inventory as a single verb?
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
49b58ae946 SCUMM: Clarify Indy 3 Mac text position hack
The text positions for the books in Indy 3 Mac only need to be adjusted
when using the low-resolution font. When using the Mac font, it works as
intended without changes.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
50259adc4f SCUMM: Fix shadowed text in Indy 3 Mac 2021-06-30 14:59:55 +02:00
Torbjörn Andersson
8f216fe7b8 SCUMM: Fiddle with font height in Indy 3 Mac
It's still not pixel perfect, but I think it looks fine for now.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
61dbbb2d72 SCUMM: Disable text position corrections for Indy 3 Mac in hi-res mode
The text rendering isn't pixel perfect compared to the original, but I
actually think ScummVM looks better. Maybe the original draws one
character at a time without compensating for when the character width
isn't even? That might account for text being slightly wider in the
original.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
0ecf7db54b SCUMM: Fix leftover text from copy protection screen in Indy 3 Mac 2021-06-30 14:59:55 +02:00
Torbjörn Andersson
3f249aa67a SCUMM: De-simplify Mac text boxes a bit
We can't pretend that the Mac text box is on the main virtual screen,
because then removing it will remove all other text on the main virtual
screen, e.g. the copy protection instructions.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
2a361f3c61 SCUMM: Simplified previous commit 2021-06-30 14:59:55 +02:00
Torbjörn Andersson
b5cfd4d5e3 SCUMM: Remove mac_restoreCharsetBg()
The differences between the two weren't as great as I had first thought.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
52fbee9ec7 SCUMM: Fix removing of the text box
That takes care of most of the remaining glitches, at least in the early
game.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
81ad3a9cf9 SCUMM: Honor the _keepText flag when creating the Indy 3 Mac text box
Sometimes more than one piece of text is drawn to the same box, and we
don't want to clear the old text then.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
c6018fe678 SCUMM: Use the Mac palette for Indy 3 Mac 2021-06-30 14:59:55 +02:00
Torbjörn Andersson
84fb97958f SCUMM: Don't draw the top of the Indy 3 Mac text box to the screen
It's only there so that the font renderer will definitely have something
to draw to.
2021-06-30 14:59:55 +02:00
Torbjörn Andersson
cfe270c8af SCUMM: Render the Indy 3 Mac text box to a separate surface.
There's still the matter of exactly when the text box should be created
(sometimes text is drawn to it in several steps, and we don't want to
erase the old text), and when/how to remove the box.
2021-06-30 14:59:55 +02:00