Cataclysm-BN icon indicating copy to clipboard operation
Cataclysm-BN copied to clipboard

Published 20 hours ago • verified publisher icon cataclysmbnteam

perf(port): Optimization tweaks

Open Kenan2000 opened this issue 9 months ago • 1 comments

Ports this pull request

https://github.com/CleverRaven/Cataclysm-DDA/pull/40961,

This also includes pull requests https://github.com/cataclysmbnteam/Cataclysm-BN/pull/4627, https://github.com/cataclysmbnteam/Cataclysm-BN/pull/4623 by @chaosvolt for easier mergeability

activity_handlers.cpp file, line 1257 throws an error during compiling which, based on conversation with @Coolthulhu, will be fixed with help of Coolthulhu or other developers or both

Coauthors have been linked properly via GitHub Desktop built-in function to do this work hopefully

Kenan2000 avatar May 11 '24 23:05 Kenan2000

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

autofix-ci[bot] avatar May 11 '24 23:05 autofix-ci[bot]

Okay so evidently https://github.com/cataclysmbnteam/Cataclysm-BN/pull/4636 contained the file changes for this PR and the other one so these can be closed? According to Kenan at least. image

I'm going to hope this is the right decision, if anyone spots anything vital in this re-open and fix merge conflicts then, bleh.

chaosvolt avatar May 30 '24 17:05 chaosvolt

Okay so it turns out merging that other PR was a mistake for reasons entirely unrelated to splitting them weirdly and instead just because the source PRs in https://github.com/cataclysmbnteam/Cataclysm-BN/pull/4635 specifically need more time in the oven before we want to port them, so I think this one specifically is 100% good to reopen after the revert, then we need to go on to figure out if anything in https://github.com/cataclysmbnteam/Cataclysm-BN/pull/4635 can be separated from the bad keybind code changes and salvaged, then lastly grab anything unique to https://github.com/cataclysmbnteam/Cataclysm-BN/pull/4635 as its own PR.

chaosvolt avatar May 30 '24 19:05 chaosvolt

Closing this because pull request of @KheirFerrum includes fixed version of this work

Kenan2000 avatar Jun 01 '24 23:06 Kenan2000