diff options
| author | Daniel M. Weeks <dan@danweeks.net> | 2015-03-27 14:33:00 -0400 |
|---|---|---|
| committer | Daniel M. Weeks <dan@danweeks.net> | 2015-04-02 22:27:18 -0400 |
| commit | 573cda7b524ee4d7d23cefd026b056181f451a8b (patch) | |
| tree | 93b17e43ac67d8a1f0d4588e2844f770432a46aa /src/server/game | |
| parent | 18acb9914a2ea8660b34bac13ea81b13a5ee9fe1 (diff) | |
Rename variables to fix C++11 keyword collision
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 5194828a0f4..b29694431ac 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -21648,9 +21648,9 @@ void Player::SetPvP(bool state) (*itr)->SetPvP(state); } -void Player::UpdatePvP(bool state, bool override) +void Player::UpdatePvP(bool state, bool _override) { - if (!state || override) + if (!state || _override) { SetPvP(state); pvpInfo.EndTimer = 0; |