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

Silence some clang-tidy warnings #34222

Merged
merged 3 commits into from
Sep 25, 2019
Merged
Changes from 1 commit
Commits
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/teleport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ bool teleport::teleport( Creature &critter, int min_distance, int max_distance,
return false;
}

const bool c_is_u = &critter == &g->u;
player *const p = critter.as_player();
const bool c_is_u = p ? c_is_u = p == g->u : false;
kevingranade marked this conversation as resolved.
Show resolved Hide resolved
int tries = 0;
tripoint origin = critter.pos();
tripoint new_pos = tripoint_zero;
tripoint new_pos;
do {
int rangle = rng( 0, 360 );
int rdistance = rng( min_distance, max_distance );
Expand Down