diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
commit | 98dabed4de60bc86522632379f2499aecbae2b70 (patch) | |
tree | 48924b90447eb513f330c1e82d9afbab3719525e /src/localplayer.cpp | |
parent | ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 (diff) | |
download | ManaVerse-98dabed4de60bc86522632379f2499aecbae2b70.tar.gz ManaVerse-98dabed4de60bc86522632379f2499aecbae2b70.tar.bz2 ManaVerse-98dabed4de60bc86522632379f2499aecbae2b70.tar.xz ManaVerse-98dabed4de60bc86522632379f2499aecbae2b70.zip |
Fix compilation errors and warnings for another gcc 4.7 snapshot.
Diffstat (limited to 'src/localplayer.cpp')
-rw-r--r-- | src/localplayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 89eb3b40a..0da291711 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -98,7 +98,7 @@ extern MiniStatusWindow *miniStatusWindow; extern SkillDialog *skillDialog; LocalPlayer::LocalPlayer(int id, int subtype): - Being(id, PLAYER, subtype, 0), + Being(id, PLAYER, subtype, nullptr), mTargetTime(-1), mLastTarget(-1), mTarget(nullptr), @@ -112,7 +112,7 @@ LocalPlayer::LocalPlayer(int id, int subtype): mPathSetByMouse(false), mLocalWalkTime(-1), mMessageTime(0), - mAwayDialog(0), + mAwayDialog(nullptr), mAfkTime(0), mAwayMode(false), mPseudoAwayMode(false), @@ -151,7 +151,7 @@ LocalPlayer::LocalPlayer(int id, int subtype): if (userPalette) mNameColor = &userPalette->getColor(UserPalette::SELF); else - mNameColor = 0; + mNameColor = nullptr; mLastTargetX = 0; mLastTargetY = 0; |