fixed empty units cannot be ship owners#1131
Open
stm2 wants to merge 1 commit intoeressea:developfrom
Open
Conversation
There was a problem hiding this comment.
Pull request overview
This pull request fixes a bug where empty units (units with number = 0) could remain as ship owners, bringing the ship ownership logic in line with the existing building ownership logic.
Changes:
- Added a check in
ship_owner()to ensure units withnumber <= 0cannot be ship owners - Corrected a test to properly test the scenario where a unit becomes empty (rather than leaving the ship)
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/kernel/ship.c | Added owner->number <= 0 check to prevent empty units from being ship owners |
| src/kernel/ship.test.c | Fixed test to use u->number = 0 instead of leave_ship(u) to match test intent |
Comments suppressed due to low confidence (2)
src/kernel/ship.test.c:160
- The test
test_shipowner_goes_to_next_when_emptyusesleave_ship(u)which tests a different scenario than intended. For consistency with the building tests and the test name, it should useu->number = 0to test the case where a unit becomes empty (rather than leaves the ship). There is a separate testtest_shipowner_goes_to_next_after_leavethat tests the leave scenario.
leave_ship(u);
src/kernel/ship.test.c:225
- The test
test_shipowner_goes_to_same_faction_when_emptyusesleave_ship()which tests a different scenario than intended. For consistency with the building tests (seetest_buildingowner_goes_to_same_faction_when_emptywhich usesu->number = 0andu3->number = 0) and the test name, it should useu->number = 0andu3->number = 0to test the case where units become empty. There is a separate testtest_shipowner_goes_to_same_faction_after_leavethat tests the leave scenario.
leave_ship(u);
CuAssertPtrEquals(tc, u3, ship_owner(sh));
leave_ship(u3);
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Tests und Implementierung für Schiffe und Gebäude war nicht parallel