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

Migrate/cleanup consumption.cpp from player to character #36991

Merged
merged 10 commits into from
Jan 20, 2020

Conversation

Ramza13
Copy link
Contributor

@Ramza13 Ramza13 commented Jan 13, 2020

Summary

SUMMARY: Infrastructure "Migrate/cleanup consumptions.cpp from player to character"

Purpose of change

Part of #34721
Move the contents of consumption.cpp from the player class to the character class

Describe the solution

Moved all the functions in consumption.cpp that were in player into character with the exception of eat. Then used variables for all the strings being used in the file to match general formatting.

Describe alternatives you've considered

Also changing over eat and moving in and migrating some other consume functions but that spiraled quickly out of control into touching all sorts of other files.

Testing

Additional context

Copy link
Member

@anothersimulacrum anothersimulacrum left a comment

Choose a reason for hiding this comment

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

Since you're changing the parameters, could you change them to something more than one character? you or guy?

src/character.h Outdated Show resolved Hide resolved
src/character.h Outdated Show resolved Hide resolved
src/character.h Outdated Show resolved Hide resolved
src/character.h Outdated Show resolved Hide resolved
src/character.h Outdated Show resolved Hide resolved
src/character.h Outdated Show resolved Hide resolved
src/character.h Outdated Show resolved Hide resolved
src/consumption.cpp Outdated Show resolved Hide resolved
src/consumption.cpp Outdated Show resolved Hide resolved
src/consumption.cpp Outdated Show resolved Hide resolved
Ramza13 and others added 3 commits January 12, 2020 21:02
Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com>
Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com>
@ZhilkinSerg ZhilkinSerg added [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Character / Player Character / Player mechanics Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style labels Jan 14, 2020
@ZhilkinSerg ZhilkinSerg merged commit 211d2aa into CleverRaven:master Jan 20, 2020
@Ramza13 Ramza13 deleted the migrate_eating branch January 21, 2020 00:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Mechanics: Character / Player Character / Player mechanics
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants