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

Fix Asset Unknown Multiple Definitions #2274

Closed
wants to merge 1 commit into from

Conversation

RobertBColton
Copy link
Contributor

This attempts to fix a conflict introduced by #2170 when the TreeNode was given a field named unknown. This causes multiple definitions of the asset_unknown enum constant.

// NOTE: -1 because protobutt doesn't allow index 0 and we're trying to match GM's values

My solution here was to just rename the new one added to TreeNode to unknown_resource for now.

enum AssetType : int {
  asset_any = -2,
  asset_unknown = -1,
  asset_unknown_resource = 998,
  asset_folder = 99,

@RobertBColton RobertBColton changed the title Fix Asset Uknown Multiple Definitions Fix Asset Unknown Multiple Definitions Sep 12, 2021
@RobertBColton RobertBColton deleted the unknown-resource-conflict branch September 12, 2021 00:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant