diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-03-13 10:30:52 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-03-13 10:30:52 -0700 |
commit | a09894839ccba98dd8cd2a15cfe09cb75de18125 (patch) | |
tree | 39300c2fabf6d202f199a9441a3e8466c8770b16 /src-06_stop-sleeping-on-tables.patch | |
parent | Update to 0.F.3 (diff) | |
download | cataclysm-dda-a09894839ccba98dd8cd2a15cfe09cb75de18125.tar.xz |
Port patches back to DDA.
Diffstat (limited to 'src-06_stop-sleeping-on-tables.patch')
-rw-r--r-- | src-06_stop-sleeping-on-tables.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src-06_stop-sleeping-on-tables.patch b/src-06_stop-sleeping-on-tables.patch new file mode 100644 index 0000000..5385655 --- /dev/null +++ b/src-06_stop-sleeping-on-tables.patch @@ -0,0 +1,22 @@ +--- a/src/character.cpp ++++ b/src/character.cpp +@@ -5101,14 +5101,18 @@ + } + } + // Not in a vehicle, start checking furniture/terrain/traps at this point in decreasing order +- else if( furn_at_pos != f_null ) { ++ else if( furn_at_pos != f_null && furn_at_pos.obj().comfort >= 5 ) { + comfort += 0 + furn_at_pos.obj().comfort; + } + // Web sleepers can use their webs if better furniture isn't available + else if( websleep && web >= 3 ) { + comfort += 1 + static_cast<int>( comfort_level::slightly_comfortable ); ++ } else if( furn_at_pos != f_null && furn_at_pos.obj().comfort >= 4 ) { ++ comfort += 0 + furn_at_pos.obj().comfort; + } else if( !trap_at_pos.is_null() ) { + comfort += 0 + trap_at_pos.comfort; ++ } else if( furn_at_pos != f_null && furn_at_pos.obj().comfort >= 1 ) { ++ comfort += 0 + furn_at_pos.obj().comfort; + } else { + // Not a comfortable sleeping spot + comfort -= here.move_cost( p ); |