ScummVM/scummvm
1
0 Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
146,050 Commits 45 Branches 139 Tags
f0ba64cc0894de59e9b7046f07aff044d7c8ecd5
Commit Graph
79 Commits
Author SHA1 Message Date
Torbjörn Andersson 12738d8856 SCUMM: Create _macIndy3Gui earlier, not in resetScumm() 
Since this is before the Mac font manager is created, load fonts when
requested rather than pre-loading them all.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson a11092859c SCUMM: Fix Mac Loom regression 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 38852234ec SCUMM: Fix printing of '...' character in Indy 3 Mac GUI 
The SCUMM engine uses "^" to represent "..." so it has to be remapped to
the appropriate Macintosh character code.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 508ade605c SCUMM: Indy 3 Mac GUI cleanup 2023-10-16 17:40:29 +02:00
Torbjörn Andersson b84fb46c49 SCUMM: Fix Indy 3 Mac scrollbar clicking behavior to be like the original 2023-10-16 17:40:29 +02:00
Torbjörn Andersson ee120bbd52 SCUMM: Fix double-clicking on Indy 3 Mac inventory items 
If the timer is already running, time it out before starting a new one.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 9902d8e133 SCUMM: Indy 3 Mac GUI cleanup 2023-10-16 17:40:29 +02:00
Torbjörn Andersson afcdabe18f SCUMM: Indy 3 Mac GUI dleanup 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 274ebe2db4 SCUMM: Moved Indy 3 Mac GUI "hiding" debug message 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 0e3eac4c34 SCUMM: Add comment to Indy 3 Mac GUI 2023-10-16 17:40:29 +02:00
Torbjörn Andersson c186a025a3 SCUMM: Redraw the Indy 3 Mac inventory scrollbar when necessary 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 2223c96395 SCUMM: More Indy 3 Mac GUI cleanups 2023-10-16 17:40:29 +02:00
Torbjörn Andersson e54128eba9 SCUMM: Fix clicking on Indy 3 Mac inventory objects 
I accidentally called the verb script twice.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 8402d2999c SCUMM: Remove low-resolution fallback for Indy 3 Mac credit undrawing 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 6d501281ff SCUMM: Redraw Indy 3 Mac GUI widget immediately if it responds to an event 2023-10-16 17:40:29 +02:00
Torbjörn Andersson a052cd4eea SCUMM: Slight drawing optimization in Indy 3 Mac GUI 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 811347569f SCUMM: More Indy 3 Mac GUI cleanup 2023-10-16 17:40:29 +02:00
Torbjörn Andersson ae3dbd74f3 SCUMM: Cleanup Indy 3 Mac GUI scrollbar logic 2023-10-16 17:40:29 +02:00
Torbjörn Andersson a67b1e9758 SCUMM: Remove Indy 3 Mac GUI verb script check 
It seems it's no longer needed. Also, cleaned up naming a bit so that
instead of "active" and "visible", the GUI is now "allowed" and
"active".
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 264295b029 SCUMM: Rework Indy 3 Mac GUI verb script check 2023-10-16 17:40:29 +02:00
Torbjörn Andersson e0f856f82c SCUMM: Indy 3 Mac GUI scroll bar fixes 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 2bc18cf971 SCUMM: Mac Indy 3 GUI: Add "const" 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 16d610f69d SCUMM: On second thought, don't adjust the Indy 3 Mac GUI scroll offset 
While it's true that we used to increase/decrease the scroll offset by
two in the old GUI, that was becaues the inventory was presented in two
columns. The scroll offset was correct, and does not have to be adjusted
when loading pre-new GUI savegames.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 30367e1dd2 SCUMM: Fix Indy 3 Mac GUI inventory string drawing 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 436872ffbb SCUMM: This should fix some transitions with the Indy 3 Mac GUI 
If the GUI says it's invisible, it's invisible. But if it says it's
visible, that may not be true because things may have changed so that
the GUI is no longer allowed to be on screen.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson e40c3a2fbb SCUMM: More Indy 3 Mac GUI cleanup + inventory scrolling 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 7186851de6 SCUMM: Fix Indy 3 Mac GUI inventory widget being undrawn over and over 2023-10-16 17:40:29 +02:00
Torbjörn Andersson cc8a1ce53d SCUMM: The Indy 3 Mac scrollbar is now a widget 
Arguably, the buttons should be part of this widget, not part of the
inventory. Maybe.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 3068bcff72 SCUMM: Removed last bit of pre-restructuring Indy 3 Mac GUI 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 6bc9ccadef SCUMM: Fix clicking on Indy 3 Mac GUI sentence line 2023-10-16 17:40:29 +02:00
Torbjörn Andersson fd63cf734d SCUMM: Hopefully fix Indy 3 Mac verb shortcut keys 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 6f8f3b4b13 SCUMM: Update Indy 3 Mac GUI less frequently 
It's enough to do it after thigns have had a chance to change. Not every
iteration of waitForTimer(). This means we no longer have as precise
resolution for our animation timers, but I don't think that's any reason
not to cut down on the (admittedly small) amount of extra work the GUI
has to do.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson ef6e3bf432 SCUMM: Indy 3 Mac GUI restructuring done. Cleanup next. 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 62af893348 SCUMM: Major (incomplete) refactoring of Indy 3 Mac GUI 
Widgets are now proper objects. I'm back to the point where verbs work
again, but not the inventory. Still, this is too scary not to commit now
that it's beginning to work again.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson a14de55dda SCUMM: More Indy 3 Mac GUI fixes 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 3bf0b424cd SCUMM: Some more Indy 3 Mac GUI cleanup 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 98229e5155 SCUMM: Hopefully fix Indy 3 Mac glitch on travel map 
The GUI should now know better when to back off and not try to clear
what's no longer the Verb screen.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 127c585362 SCUMM: More work on Indy 3 Mac GUI 
It's now possible to travel all the way to Venice, though there is a
glitch on the travel map there.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson b8d5096d7c SCUMM: Some more Indy 3 Mac inventory work 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 702ec52d96 SCUMM: Lots of Indy 3 Mac GUI rewriting 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 1875d19349 SCUMM: Remove untrue Indy 3 GUI comment 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 95015600d1 SCUMM: Fix order of Mac Indy 3 verb buttons 
I had only updated the comments, not the rest of it. Oops.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 1357be25f4 SCUMM: Migrate Indy 3 Mac widget positions to Common::Rect 
It's easier to use width/height when initializing them, but after that
rectangles are more helpful.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 560f49d9cf SCUMM: Fix some Indy 3 Mac bugs, and add two more button widgets 2023-10-16 17:40:29 +02:00
Torbjörn Andersson ead11c29e7 SCUMM: Try to fix Indy 3 Mac GUI after loading 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 654090043b SCUMM: Fix glitches in Indy 3 Mac GUI 
Apparently verb slot 0 is special.
 2023-10-16 17:40:29 +02:00
Torbjörn Andersson eeac1b24ef SCUMM: Indy 3 Mac responds to verbs now 2023-10-16 17:40:29 +02:00
Torbjörn Andersson fde1fc8717 SCUMM: Hide the Indy 3 Mac GUI when there's nothing to show in it 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 89908e1b31 SCUMM: Kill Indy 3 Mac widgets when they're gone 2023-10-16 17:40:29 +02:00
Torbjörn Andersson bdd1de7431 SCUMM: Some remaning, and added animation to Indy 3 Mac buttons 2023-10-16 17:40:29 +02:00