Remove more uses of AList/AListElem #218
Merged
Conversation
This file contains 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
Contributor
jt-traub
commented
Sep 28, 2024
jt-traub
commented
- Shields are now an stl container. Reimplemented get highest shield in terms of the STL in-place since it was only used once and got rid of the shieldlist class as well. In order to simplify memory management replaces the Shield * with shared_ptr which provides a smart ref-counted pointer, so that just clearing (or erasing) an element from the container will delete the allocated memory. Moved the definition of Shield into army.h which was the only thing that used it now.
- Removed all uses of AList from the quests system (quests and rewards). Retained the QuestList class since it had a number of useful functions and reworked it using an internal std::vector. Renamed all the member functions to follow intended style going forward.
- Removed vestiges of AList from productions. This had mostly been done, so this was just cleaning up a leftover place or two where it hadn't been fully removed. Also renamed the production class's functions using the new style.
- Removed vestiges of AList from markets. This has been partially done previously, this was just cleaning up some leftover turds. Renamed Market class functions to use new style of naming. Made the enum type for the market into a named enum and part of the Market class for scoping reasons.
Shields are now an stl container. Reimplemented get highest shield in terms of the STL in-place since it was only used once and got rid of the shieldlist class as well. In order to simplify memory management replaces the Shield * with shared_ptr<Shield> which provides a smart ref-counted pointer, so that just clearing (or erasing) an element from the container will delete the allocated memory.
Removed all uses of AList from the quests system (quests and rewards). Retained the QuestList class since it had a number of useful functions and reworked it using an internal std::vector. Renamed all the member functions to follow intended style going forward.
This had mostly been done, so this was just cleaning up a leftover place or two where it hadn't been fully removed. Also renamed the production class's functions using the new style.
jt-traub
commented
Sep 28, 2024
| @@ -28,26 +28,7 @@ | |||
| #include "gameio.h" | |||
| #include "gamedata.h" | |||
|
|
|||
| Market::Market() | |||
There was a problem hiding this comment.
I moved these into the header file with the more modern style of member variable initialization.
jt-traub
commented
Sep 28, 2024
| else { | ||
| if (population >= maxpop) |
There was a problem hiding this comment.
Just denesting some ifs.
jt-traub
commented
Sep 28, 2024
| //AString Report(); | ||
| }; | ||
|
|
||
| class MarketList : std::vector<Market*> { |
There was a problem hiding this comment.
This wasn't used, AND deriving from STL containers is a bad idea since they don't have virtual destructors.
This has been partially done previously, this was just cleaning up some leftover turds. Renamed Market class functions to use new style of naming. Make the enum type for the market into a named enum.
jt-traub
force-pushed
the
jt-no-more-alist-3
branch
from
c94546e
to
1e48676
Compare
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.