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.

Sign up for GitHub

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

Fixed "Evolution doesn't happen with initial day set at 30 #33450" #33487

Merged
merged 1 commit into from
Aug 27, 2019
+2 −2
Merged

Fixed "Evolution doesn't happen with initial day set at 30 #33450" #33487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/monster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ void monster::try_upgrade( bool pin_time )
return;
}

const int current_day = to_days<int>( calendar::turn - time_point( calendar::start_of_cataclysm ) );
const int current_day = to_days<int>( calendar::turn - calendar::start_of_cataclysm );
//This should only occur when a monster is created or upgraded to a new form
if( upgrade_time < 0 ) {
upgrade_time = next_upgrade_time();
Expand All @@ -359,7 +359,7 @@ void monster::try_upgrade( bool pin_time )
} else {
// offset by starting season
// @todo revisit this and make it simpler
upgrade_time += to_turn<int>( calendar::start_of_cataclysm );
upgrade_time += to_days<int>( calendar::start_of_cataclysm - calendar::turn_zero );
}
}

Expand Down