diff options
| -rwxr-xr-x | bmake | 3 | ||||
| -rwxr-xr-x | bmake46 | 5 | ||||
| -rw-r--r-- | src/being.cpp | 1 | ||||
| -rw-r--r-- | src/configuration.cpp | 7 | ||||
| -rw-r--r-- | src/configuration.h | 2 | ||||
| -rw-r--r-- | src/graphicsvertexes.h | 3 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 3 | ||||
| -rw-r--r-- | src/gui/shopwindow.h | 2 | ||||
| -rw-r--r-- | src/gui/tradewindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/updatewindow.cpp | 2 | ||||
| -rw-r--r-- | src/map.cpp | 5 | ||||
| -rw-r--r-- | src/net/tmwa/chathandler.cpp | 4 |
12 files changed, 23 insertions, 18 deletions
@@ -32,7 +32,8 @@ export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \ -Wunused-parameter -Wlogical-op \ -Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ -Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ --Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe" +-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ +-Wpacked" autoreconf -i ./configure --prefix=$dir/run \ @@ -25,8 +25,6 @@ #need fix: -Wpadded #prof -pg -#add after elemination enet: -Wpacked - dir=`pwd` export CC=gcc-4.6 @@ -47,7 +45,8 @@ export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls -Wpacked-bitfield-com -Wunused-parameter -Wlogical-op \ -Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ -Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ --Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe" +-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ +-Wpacked" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/src/being.cpp b/src/being.cpp index fcf230dc0..cbdb8af8d 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -2307,7 +2307,6 @@ void Being::saveComment(const std::string &name, { std::string dir = Client::getUsersDirectory() + stringToHexPath(name); - std::string fileName = dir + "/comment.txt"; ResourceManager *resman = ResourceManager::getInstance(); resman->saveTextFile(dir, "comment.txt", name + "\n" + comment); } diff --git a/src/configuration.cpp b/src/configuration.cpp index 2d569314a..21d9d998f 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -145,6 +145,13 @@ ConfigurationObject::~ConfigurationObject() clear(); } +Configuration::Configuration() : + mConfigPath(""), + mDefaultsData(0), + mDirectory("") +{ +} + void Configuration::cleanDefaults() { if (mDefaultsData) diff --git a/src/configuration.h b/src/configuration.h index 64c60c734..4b0238e9a 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -209,6 +209,8 @@ class ConfigurationObject class Configuration : public ConfigurationObject { public: + Configuration(); + ~Configuration(); /** diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h index c5daab6cb..c462de976 100644 --- a/src/graphicsvertexes.h +++ b/src/graphicsvertexes.h @@ -30,6 +30,9 @@ #define NO_SDL_GLEXT #include <SDL_opengl.h> + +#include "opengl1graphics.h" +#include "openglgraphics.h" #endif #include <string> diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 8afb0ae69..d3ee64f3a 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -302,7 +302,8 @@ Setup_Video::Setup_Video(): mPickupParticleCheckBox(new CheckBox(_("as particle"), mPickupParticleEnabled)), mAlphaCacheCheckBox(new CheckBox(_("Enable opacity cache"), mAlphaCache)), - mEnableMapReduceCheckBox(new CheckBox(_("Enable map reduce"), mEnableMapReduce)), + mEnableMapReduceCheckBox(new CheckBox(_("Enable map reduce"), + mEnableMapReduce)), mShowBackgroundCheckBox(new CheckBox(_("Show background"), mShowBackground)), mSpeechSlider(new Slider(0, 3)), diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h index bad4a0a4e..e07803225 100644 --- a/src/gui/shopwindow.h +++ b/src/gui/shopwindow.h @@ -95,7 +95,7 @@ class ShopWindow : public Window, public gcn::ActionListener, * Returns true if any instances exist. */ static bool isActive() - { return instances.size() > 0; } + { return !instances.empty(); } void setItemSelected(int id) { mSelectedItem = id; updateButtonsAndLabels(); } diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index e3fb323e6..c607636d9 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -85,10 +85,6 @@ TradeWindow::TradeWindow(): if (setupWindow) setupWindow->registerWindowForReset(this); - std::string longestName = getFont()->getWidth(_("OK")) > - getFont()->getWidth(_("Trade")) ? - _("OK") : _("Trade"); - mAddButton = new Button(_("Add"), "add", this); mOkButton = new Button("", "", this); // Will be filled in later diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 42ed1c289..d17defb45 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -537,8 +537,6 @@ void UpdaterWindow::logic() } } - std::string filename = mUpdatesDir + "/" + mCurrentFile; - switch (mDownloadStatus) { case UPDATE_ERROR: diff --git a/src/map.cpp b/src/map.cpp index 0d98628fd..8d7002689 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -906,6 +906,9 @@ void Map::blockTile(int x, int y, BlockType type) case BLOCKTYPE_WATER: mMetaTiles[tileNum].blockmask |= BLOCKMASK_WATER; break; + case BLOCKTYPE_GROUND: + mMetaTiles[tileNum].blockmask |= BLOCKMASK_GROUND; + break; default: case BLOCKTYPE_NONE: case NB_BLOCKTYPES: @@ -1364,7 +1367,7 @@ void Map::addExtraLayer() return; } char line[201]; - std::string buf; + while (mapFile.getline(line, 200)) { std::string buf; diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index c9862cd53..3ce30ce84 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -244,7 +244,6 @@ void ChatHandler::handleMessage(Net::MessageIn &msg) if (!being || chatMsgLength <= 0) break; - std::string str2; chatMsg = msg.readRawString(chatMsgLength); if (being->getType() == Being::PLAYER) @@ -293,7 +292,6 @@ void ChatHandler::handleMessage(Net::MessageIn &msg) if (chatMsgLength <= 0) break; - std::string str2; chatMsg = msg.readRawString(chatMsgLength); std::string::size_type pos = chatMsg.find(" : ", 0); @@ -301,8 +299,6 @@ void ChatHandler::handleMessage(Net::MessageIn &msg) { if (chatWindow) chatWindow->resortChatLog(chatMsg, BY_PLAYER); -// if (localChatTab) -// localChatTab->chatLog(chatMsg, BY_PLAYER); const std::string senseStr = "You sense the following: "; if (actorSpriteManager && !chatMsg.find(senseStr)) |