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

separate patches into dedicated source files #4

Merged
merged 5 commits into from
Jan 29, 2021

Conversation

FranciscoDA
Copy link
Contributor

No description provided.

}

bool hasNaturalResourceCost(const genie::Unit &unit) {
std::vector<ResourceCost> costs = unit.Creatable.ResourceCosts;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like there are a few issues with spaces and tabs in this file 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops, my bad

CMakeLists.txt Outdated
@@ -4,6 +4,19 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++")
add_subdirectory(genieutils EXCLUDE_FROM_ALL)
include_directories(
"genieutils/include"
"."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"."
"."

@simonsan
Copy link
Contributor

simonsan commented Jan 29, 2021

Looks good, really like that change, much better overview and easier to add new mods in the future! 👍🏽

@simonsan
Copy link
Contributor

@FranciscoDA What did you use for code formatting, do you have a .clang-format you may want to commit to keep the code style. Seems clean and nice.

@FranciscoDA
Copy link
Contributor Author

@FranciscoDA What did you use for code formatting, do you have a .clang-format you may want to commit to keep the code style. Seems clean and nice.

Manually formatted I'm afraid 😰 (although I honored the original formatting a bit)

I've added a .clang-format file and reformatted the sources according to that.

@HSZemi HSZemi merged commit bcb4d32 into SiegeEngineers:master Jan 29, 2021
@HSZemi
Copy link
Member

HSZemi commented Jan 29, 2021

Thank you! 💛

@simonsan
Copy link
Contributor

Nice! 👍🏽

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.

3 participants