From a0b6e09737b7b416a38c08d8e1d6744a4cc12f7d Mon Sep 17 00:00:00 2001 From: Roderic Morris Date: Sun, 15 Jun 2008 02:24:40 +0000 Subject: fix compiler and cmake warnings --- ChangeLog | 5 +++++ data/graphics/CMakeLists.txt | 1 - data/graphics/images/CMakeLists.txt | 2 -- src/gui/viewport.cpp | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24b2ab34..47d0b364 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-14 Roderic Morris + + * src/gui/viewport.cpp, data/graphics/images/CMakeLists.txt, + data/graphics/CMakeLists.txt: Fix compiler and cmake warnings. + 2008-06-11 David Athay * src/gui/guildlistbox.cpp: Fixed displaying guild members in guild diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt index 9a916db3..58d75523 100644 --- a/data/graphics/CMakeLists.txt +++ b/data/graphics/CMakeLists.txt @@ -1,3 +1,2 @@ ADD_SUBDIRECTORY(gui) ADD_SUBDIRECTORY(images) -ADD_SUBDIRECTORY(tiles) diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt index a8b6ddbd..5181b4e1 100644 --- a/data/graphics/images/CMakeLists.txt +++ b/data/graphics/images/CMakeLists.txt @@ -1,5 +1,3 @@ -ADD_SUBDIRECTORY(ambient) - SET(FILES error.png login_wallpaper.png diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 4036f588..11dbb146 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -56,10 +56,10 @@ Viewport::Viewport(): mViewX(0.0f), mViewY(0.0f), mShowDebugPath(false), + mVisibleNames(false), mPlayerFollowMouse(false), mWalkTime(0), - mLocalWalkTime(-1), - mVisibleNames(false) + mLocalWalkTime(-1) { setOpaque(false); addMouseListener(this); -- cgit v1.2.3-70-g09d2