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

Fix for "temperature too low" #23518

Merged
merged 3 commits into from Apr 18, 2018

Conversation

Projects
None yet
3 participants
@Moumix3
Copy link
Contributor

commented Apr 17, 2018

Fix for "temperature too low" after @BevapDin's changes on time classes in weather_gen.cpp #23327

https://discourse.cataclysmdda.org/t/latest-experimental-too-cold-freezing-with-warm-clothes/15260

Moumix3 added some commits Apr 17, 2018

@@ -42,7 +42,7 @@ w_point weather_generator::get_weather( const tripoint &location, const time_poi
double A( raw_noise_4d( x, y, z, modSEED ) * 8.0 );
double W;

const double now( time_past_new_year( t ) / calendar::year_length() ); // [0,1)
const double now( ( time_past_new_year( t ) + calendar::season_length() / 2 ) / calendar::year_length() ); // [0,1)

This comment has been minimized.

Copy link
@ZhilkinSerg

ZhilkinSerg Apr 17, 2018

Contributor

Astyle regression. This line should be split into two lines:

image

@Moumix3

This comment has been minimized.

Copy link
Contributor Author

commented Apr 17, 2018

Thanks for the tip on Astyle, ZhilkinSerg. I was not understanding what I did wrong, but didn't think of splitting the line because it was too long. :)

@Leland

This comment has been minimized.

Copy link
Contributor

commented Apr 18, 2018

Fixes #23502

@ZhilkinSerg ZhilkinSerg self-assigned this Apr 18, 2018

@ZhilkinSerg ZhilkinSerg removed their assignment Apr 18, 2018

@ZhilkinSerg ZhilkinSerg merged commit 5f5b87b into CleverRaven:master Apr 18, 2018

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.5%) to 24.149%
Details
gorgon-ghprb Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.