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

misc fixes for unloading via AIM #79316

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

marilynias
Copy link
Contributor

Summary

None

Purpose of change

Follow-up to #79187, where I introduced unloading via AIM.
Clothing containing items could not be unloaded.
De-duplicate checks and error-messages already in Character::unload().

Describe the solution

sitem -> contents_count returns 0 for clothing with items in them. Replace it with correct empty check.
Be less picky what to pass to unload() and let it display the error message.

Describe alternatives you've considered

fix sitem -> contents_count, but I don't know if its intended or how it affects other parts.

Testing

Clothing can be unloaded

Additional context

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 24, 2025
@marilynias
Copy link
Contributor Author

marilynias commented Jan 24, 2025

huh

E: Failed to fetch http://security.ubuntu.com/ubuntu/pool/main/u/util-linux/uuid-dev_2.39.3-9ubuntu6.1_amd64.deb  404  Not Found [IP: 40.81.13.82 80]
E: Failed to fetch http://security.ubuntu.com/ubuntu/pool/main/u/util-linux/libblkid-dev_2.39.3-9ubuntu6.1_amd64.deb  404  Not Found [IP: 40.81.13.82 80]
E: Failed to fetch http://security.ubuntu.com/ubuntu/pool/main/u/util-linux/libmount-dev_2.39.3-9ubuntu6.1_amd64.deb  404  Not Found [IP: 40.81.13.82 80]
E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?

https://github.com/CleverRaven/Cataclysm-DDA/actions/runs/12947198948/job/36113432940?pr=79316#step:2:311

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant