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

Fix Travis build failure overmap test #36728

Closed
wants to merge 8 commits into from
Closed

Fix Travis build failure overmap test #36728

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e3bb1b3
Merge pull request #1 from CleverRaven/master
8street Dec 7, 2019
b5d17e9
Merge pull request #2 from CleverRaven/master
8street Dec 14, 2019
df84d2a
Merge branch 'master' of https://github.com/8street/Cataclysm-DDA
8street Dec 27, 2019
5c83410
Merge pull request #3 from CleverRaven/master
8street Dec 30, 2019
5830f7d
Merge remote-tracking branch 'upstream/master'
8street Dec 31, 2019
14ae261
Merge remote-tracking branch 'upstream/master' into Fix-Travis-build-…
8street Jan 5, 2020
cd1bb83
Editing overmap.cpp
8street Jan 5, 2020
62544f8
Editing overmap.cpp 2
8street Jan 5, 2020
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
8 changes: 4 additions & 4 deletions src/overmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3174,11 +3174,11 @@ void overmap::build_anthill( const tripoint &p, int s )
}
}
}
if( queenpoints.empty() ) {
debugmsg( "No queenpoints when building anthill" );

if( !queenpoints.empty() ) {
const tripoint target = random_entry( queenpoints );
ter_set( target, oter_id( "ants_queen" ) );
}
const tripoint target = random_entry( queenpoints );
ter_set( target, oter_id( "ants_queen" ) );

const oter_id root_id( "ants_isolated" );

Expand Down