-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
move members of player:: to Character:: #35148
Conversation
e31fc2b
to
dea2623
Compare
Fixed the merge conflicts, should be good to go. |
g++ -DGIT_VERSION -DBACKTRACE -DLOCALIZE -ffast-math -Og -Werror -Wall -Wextra -Wmissing-declarations -Wold-style-cast -Woverloaded-virtual -Wpedantic -g -fsigned-char -std=c++14 -MMD -MP -D_GNU_SOURCE -D_DEFAULT_SOURCE -I/usr/include/ncursesw -I../src -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas -Wno-parentheses -MMD -MP -Wall -Wextra -c npc_talk_test.cpp -o obj/npc_talk_test.o |
I think that's from the #35147. Two branches together? |
Moved: is_wielding() use_amount() use_charges() use_charges_if_avail() use_fire()
This function is massive and dragged a whole bunch of stuff along with it.
dea2623
to
df335f5
Compare
Couldn't reproduce those build errors @kevingranade. Just force-pushed again to resolve a minor conflict. |
…haracter" This reverts commit 0278ae1.
This introduced #35184. |
…yer-to-character" (CleverRaven#35185)" This reverts commit 15bd2e1.
Summary
SUMMARY: Infrastructure "move a large number of members from player to character"
Purpose of change
part of #34721
Describe the solution
list of members moved:
update_bodytemp()
temp_equalizer()
blood_loss()
in_climate_control()
get_wind_resistance()
get_armor_fire()
is_wielding()
use_amount()
use_charges_if_avail()
use_charges()
has_fire()
use_fire()
metabolic_rate()
warmth()
bonus_item_warmth()
can_use_floor_warmth()
floor_bedding_warmth()
floor_item_warmth()
bodytemp_modifier_traits_floor()
bodytemp_modifier_traits()
temp_corrected_by_climate_control()
in_sleep_state()
global_square_location()
global_omt_location()
std::array<int, num_bp> temp_cur, frostbite_timer, temp_conv, body_wetness, drench_capacity
time_point next_climate_control_check
bool last_climate_control_ret
Testing
Additional context