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

Character code reorganization 09-jan-2023 #2283

Merged
merged 24 commits into from
Feb 13, 2023

Conversation

olanti-p
Copy link
Contributor

@olanti-p olanti-p commented Jan 9, 2023

Summary

SUMMARY: Infrastructure "Reorganized some Character-related code"

Purpose of change

Dismantling player.

Describe the solution

See commits.

  1. Move some functions and members out of player into Character
  2. Move some functions out of player and turn them into namespaced functions
  3. Move some functions out of Character and turn them into namespaced functions
  4. Move reload_option out of item to allow forward declaring it
  5. Fix traits/mounts not affecting NPC lift strength when assisting
  6. Encapsulate theft witnessing code
  7. Remove some dead code
  8. Remove some dead parameters
  9. Opportunistically migrate from g->u

Testing

Game compiles. No behavior changes intended.

TODO:

  • Playtest the changes
  • See what clang-tidy thinks about this

Additional context

I don't like how creature.cpp is growing here, may need to split it up later

@github-actions github-actions bot added src changes related to source code. tests changes related to tests labels Jan 9, 2023
@olanti-p olanti-p changed the title Character code reorganization 09-jan-2023 [WiP] Character code reorganization 09-jan-2023 Jan 9, 2023
@olanti-p olanti-p mentioned this pull request Jan 9, 2023
6 tasks
@olanti-p olanti-p changed the title [WiP] Character code reorganization 09-jan-2023 Character code reorganization 09-jan-2023 Jan 11, 2023
@Coolthulhu Coolthulhu self-assigned this Jan 15, 2023
@Coolthulhu
Copy link
Member

Conflicts with #2254. I'll mergetest #2254 first, because it's older.

@Coolthulhu Coolthulhu removed their assignment Jan 15, 2023
@olanti-p olanti-p force-pushed the code-reorg-09-jan-2023 branch from be913ac to b63059a Compare January 19, 2023 21:19
@olanti-p
Copy link
Contributor Author

Resolved.

@Coolthulhu Coolthulhu self-assigned this Feb 6, 2023
@Coolthulhu Coolthulhu merged commit 2ec4e7d into cataclysmbnteam:upload Feb 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src changes related to source code. tests changes related to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants