diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/gui/outfitwindow.cpp | |
parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
download | ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/gui/outfitwindow.cpp')
-rw-r--r-- | src/gui/outfitwindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index 8e0791af1..c33c753bc 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -57,13 +57,13 @@ float OutfitWindow::mAlpha = 1.0; OutfitWindow::OutfitWindow(): - Window(_("Outfits"), false, 0, "outfits.xml"), + Window(_("Outfits"), false, nullptr, "outfits.xml"), mBoxWidth(33), mBoxHeight(33), mGridWidth(4), mGridHeight(3), mItemClicked(false), - mItemMoved(NULL), + mItemMoved(nullptr), mItemSelected(-1), mItemColorSelected(1), mCurrentOutfit(0), @@ -383,7 +383,7 @@ void OutfitWindow::mouseDragged(gcn::MouseEvent &event) if (item) mItemMoved = item; else - mItemMoved = 0; + mItemMoved = nullptr; mItems[mCurrentOutfit][index] = -1; } } @@ -433,7 +433,7 @@ void OutfitWindow::mouseReleased(gcn::MouseEvent &event) const int index = getIndexFromGrid(event.getX(), event.getY()); if (index == -1) { - mItemMoved = NULL; + mItemMoved = nullptr; Window::mouseReleased(event); return; } @@ -443,7 +443,7 @@ void OutfitWindow::mouseReleased(gcn::MouseEvent &event) { mItems[mCurrentOutfit][index] = mItemMoved->getId(); mItemColors[mCurrentOutfit][index] = mItemMoved->getColor(); - mItemMoved = NULL; + mItemMoved = nullptr; } if (mItemClicked) mItemClicked = false; |