Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AGI: Refactor PictureMgr, support early KQ1 pics, fix Troll fill #6388

Merged
merged 7 commits into from
Jan 5, 2025

Conversation

sluicebox
Copy link
Member

This PR:

  • Creates PictureMgr subclasses to separate PreAGI code from AGI
  • Implements KQ1-Early picture support in a new PictureMgr subclass
  • Implements Troll Tale's custom flood fill, fixing the Troll
  • Documents PictureMgr and friends

At some point this was about adding Apple II picture cropping. Detours were made.

While testing, I saw that the Troll from Troll's Tale was missing flood fills in some rooms, so that got reversed and bundled in. It was a good test of the new structure.

To my knowledge, this is the first public implementation of the "Game Adaptation Langage" picture format from early KQ1. I reverse engineered it last month and developed the renderer in my tools, so porting it over was another good test. Although this KQ1 code isn't directly usable (yet??) I patched scummvm to display all the pictures for screenshots and they look good. We are nowhere near supporting these KQ1 versions of course, but now there's one less obstacle.

Show thy face, Troll

1
2

Show thy shirt, Troll

3
4

Screenshots of futures past

k1
k2
kq3
kq5
kq6

@bluegr
Copy link
Member

bluegr commented Jan 5, 2025

Very nice work!
Subclassing the picture manager made the code much clearer, clearly separating the changes in the different AGI versions. It's great to see that documentation on the various picture functions had been added. Glad to see progress with the early KQ1 booter version :)

Thanks! Merging

@bluegr bluegr merged commit 82f79ad into scummvm:master Jan 5, 2025
8 checks passed
@sluicebox sluicebox deleted the agi-pix branch January 5, 2025 17:43
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