Backport Actor Extension and Actor List Index from 2ship.#5204
Closed
leggettc18 wants to merge 2 commits intoHarbourMasters:developfrom
Closed
Backport Actor Extension and Actor List Index from 2ship.#5204leggettc18 wants to merge 2 commits intoHarbourMasters:developfrom
leggettc18 wants to merge 2 commits intoHarbourMasters:developfrom
Conversation
Contributor
Author
|
Putting on do not merge until 9.0 releases, this should be post-9.0, I just wanted to get it out there so no one did any duplicated effort. |
6457496 to
64710b5
Compare
Contributor
Author
|
9.0 is out, so do-not-merge comes off! This is good for review/merge anytime! |
garrettjoecox
approved these changes
Apr 2, 2025
Archez
reviewed
Apr 5, 2025
|
|
||
| #include "textures/icon_item_static/icon_item_static.h" | ||
| #include "textures/icon_item_24_static/icon_item_24_static.h" | ||
| #include <soh/ActorExtension/ActorListIndex.h> |
Contributor
There was a problem hiding this comment.
When importing our own files from within the src, use quotes instead of brackets
Suggested change
| #include <soh/ActorExtension/ActorListIndex.h> | |
| #include "soh/ActorExtension/ActorListIndex.h" |
| #include "textures/place_title_cards/g_pn_56.h" | ||
| #include "textures/place_title_cards/g_pn_57.h" | ||
| #endif | ||
| #include <soh/ActorExtension/ActorListIndex.h> |
Contributor
There was a problem hiding this comment.
Same thing
Suggested change
| #include <soh/ActorExtension/ActorListIndex.h> | |
| #include "soh/ActorExtension/ActorListIndex.h" |
| #define ACTOR_LIST_INDEX_H | ||
|
|
||
| #include <libultraship/libultraship.h> | ||
| #include <soh/ActorExtension/ActorExtension.h> |
Contributor
There was a problem hiding this comment.
Same
Suggested change
| #include <soh/ActorExtension/ActorExtension.h> | |
| #include "soh/ActorExtension/ActorExtension.h" |
Contributor
|
I believe this can be closed now that #5429 is merged. |
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
4 participants
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.
Backports the Actor Extension system and Actor List Index from 2ship. Currently Actor List Index is the only thing using the Actor Extension system, and the only place the Actor List Index is actually used is in the Actor Viewer, where I added the Actor List Index there specifically to show it off. Actor List Index can be used later instead of coordinates for some of the rando actor identifications, and the Actor Extension system can be used for much more in the future. For instance, I plan to use it to track what RC we are currently collecting on the player actor so that the game do different things depending on where the item came from, such as making items that came from Skulltula locations behave more like vanilla Skull Tokens.
Build Artifacts