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

NUVIE: Fix Ultima 6 item order #4806

Merged
merged 3 commits into from Mar 14, 2023

Conversation

PushmePullyu
Copy link
Contributor

Addresses the following problems:

  1. UseCode::search_container() moves items to the map in the wrong order
  2. When loading a chunk items are added to containers in the wrong order (e.g. Iolos starting bag and the chest in the Avatars room SW of the throne room)

This assumes the correct order is the one expected by the inventory GUI.

The items should be ordered as follows when starting a new game with these fixes:
Gargoyle corpse: weapons first, helmets/armor last
Iolos bag: knife first, grapes last
Avatar chest: torches first, chain coif last

Fixes #13514

Add items to containers in the correct order when loading a chunk.
Traverse container content list from the start instead of the end
so items get moved to the map in the correct order.

Fixes #13514
Traverse container content list from the start instead of the end
when saving chunks so the items are stored in the correct order.
@dreammaster
Copy link
Member

All looks good. Merging

@dreammaster dreammaster merged commit 33d1a4f into scummvm:master Mar 14, 2023
1 check passed
@PushmePullyu PushmePullyu deleted the fix-u6-item-order branch March 14, 2023 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants