summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-20 16:40:24 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-20 16:40:24 +0300
commit1e9b7c519953c73c6e5ca4ce2169eb674267c115 (patch)
tree5e331bef424935c0f6d2a2291eb189cd50f68a3d /src
parentc63923c39572655f3d8e826b0fb2fd3ed253ae7f (diff)
downloadManaVerse-1e9b7c519953c73c6e5ca4ce2169eb674267c115.tar.gz
ManaVerse-1e9b7c519953c73c6e5ca4ce2169eb674267c115.tar.bz2
ManaVerse-1e9b7c519953c73c6e5ca4ce2169eb674267c115.tar.xz
ManaVerse-1e9b7c519953c73c6e5ca4ce2169eb674267c115.zip
fix style in other files.
Diffstat (limited to 'src')
-rw-r--r--src/actor.cpp4
-rw-r--r--src/actorsprite.cpp5
-rw-r--r--src/actorspritemanager.cpp3
-rw-r--r--src/being.cpp20
-rw-r--r--src/being.h2
-rw-r--r--src/chatlogger.cpp9
-rw-r--r--src/client.cpp18
-rw-r--r--src/client.h37
-rw-r--r--src/commandhandler.cpp3
-rw-r--r--src/compoundsprite.cpp4
-rw-r--r--src/configuration.cpp8
-rw-r--r--src/configuration.h2
-rw-r--r--src/depricatedevent.h3
-rw-r--r--src/effectmanager.cpp3
-rw-r--r--src/graphics.cpp4
-rw-r--r--src/graphicsmanager.cpp5
-rw-r--r--src/graphicsvertexes.cpp19
-rw-r--r--src/graphicsvertexes.h6
-rw-r--r--src/guild.cpp3
-rw-r--r--src/guildmanager.cpp1
-rw-r--r--src/inventory.cpp1
-rw-r--r--src/item.cpp6
-rw-r--r--src/joystick.cpp5
-rw-r--r--src/keyboardconfig.cpp5
-rw-r--r--src/localplayer.cpp4
-rw-r--r--src/logger.cpp3
-rw-r--r--src/map.cpp15
-rw-r--r--src/map.h13
-rw-r--r--src/maplayer.cpp29
-rw-r--r--src/maplayer.h9
-rw-r--r--src/mobileopenglgraphics.cpp9
-rw-r--r--src/mobileopenglgraphics.h2
-rw-r--r--src/mumblemanager.cpp3
-rw-r--r--src/normalopenglgraphics.cpp9
-rw-r--r--src/normalopenglgraphics.h2
-rw-r--r--src/particle.cpp4
-rw-r--r--src/particlecontainer.cpp6
-rw-r--r--src/party.cpp2
-rw-r--r--src/playerinfo.h7
-rw-r--r--src/playerrelations.cpp5
-rw-r--r--src/playerrelations.h8
-rw-r--r--src/properties.h5
-rw-r--r--src/safeopenglgraphics.cpp4
-rw-r--r--src/shopitem.cpp8
-rw-r--r--src/soundmanager.cpp2
-rw-r--r--src/spellmanager.cpp4
-rw-r--r--src/sprite.h5
-rw-r--r--src/statuseffect.cpp5
-rw-r--r--src/test/testlauncher.cpp3
-rw-r--r--src/test/testmain.cpp3
-rw-r--r--src/text.cpp2
-rw-r--r--src/textmanager.cpp3
-rw-r--r--src/tileset.h3
-rw-r--r--src/touchmanager.cpp1
54 files changed, 273 insertions, 81 deletions
diff --git a/src/actor.cpp b/src/actor.cpp
index 2ff31dd92..0ca168e32 100644
--- a/src/actor.cpp
+++ b/src/actor.cpp
@@ -30,7 +30,9 @@
Actor::Actor():
mMap(nullptr),
- mYDiff(0)
+ mPos(),
+ mYDiff(0),
+ mMapActor()
{
}
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index 930289c74..2e21c3432 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -51,10 +51,13 @@ ActorSprite::ActorSprite(const int id) :
Actor(),
mId(id),
mStunMode(0),
+ mStatusEffects(),
+ mStunParticleEffects(),
mStatusParticleEffects(&mStunParticleEffects, false),
mChildParticleEffects(&mStatusParticleEffects, false),
mMustResetParticles(false),
- mUsedTargetCursor(nullptr)
+ mUsedTargetCursor(nullptr),
+ mActorSpriteListeners()
{
}
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 6de1e0396..3f0f7b5d4 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -181,6 +181,9 @@ class SortBeingFunctor final
} beingActorSorter;
ActorSpriteManager::ActorSpriteManager() :
+ mActors(),
+ mDeleteActors(),
+ mBlockedBeings(),
mMap(nullptr),
mSpellHeal1(serverConfig.getValue("spellHeal1", "#lum")),
mSpellHeal2(serverConfig.getValue("spellHeal2", "#inma")),
diff --git a/src/being.cpp b/src/being.cpp
index c5116039a..9411cbe8b 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -201,6 +201,7 @@ typedef std::map<int, int>::const_iterator IntMapCIter;
Being::Being(const int id, const Type type, const uint16_t subtype,
Map *const map) :
ActorSprite(id),
+ mNextSound(),
mInfo(BeingInfo::unknown),
mActionTime(0),
mEmotionSprite(nullptr),
@@ -214,12 +215,25 @@ Being::Being(const int id, const Type type, const uint16_t subtype,
mDirectionDelayed(0),
mSpriteDirection(DIRECTION_DOWN),
mSpriteAction(SpriteAction::STAND),
+ mName(),
+ mRaceName(),
+ mPartyName(),
+ mGuildName(),
mDispName(nullptr),
+ mNameColor(nullptr),
mShowName(false),
mEquippedWeapon(nullptr),
+ mPath(),
+ mSpeech(),
mText(nullptr),
+ mTextColor(nullptr),
mLevel(0),
+ mDest(),
+ mSpriteIDs(),
+ mSpriteColors(),
+ mSpriteColorsIds(),
mGender(GENDER_UNSPECIFIED),
+ mGuilds(),
mParty(nullptr),
mIsGM(false),
mAttackRange(1),
@@ -234,6 +248,11 @@ Being::Being(const int id, const Type type, const uint16_t subtype,
mDistance(0),
mIsReachable(REACH_UNKNOWN),
mGoodStatus(-1),
+ mMoveTime(0),
+ mAttackTime(0),
+ mTalkTime(0),
+ mOtherTime(0),
+ mTestTime(cur_time),
mErased(false),
mEnemy(false),
mIp(""),
@@ -281,7 +300,6 @@ Being::Being(const int id, const Type type, const uint16_t subtype,
setShowName(mShowName);
updateColors();
- resetCounters();
updatePercentHP();
}
diff --git a/src/being.h b/src/being.h
index 8a07330f5..1d1e01c5e 100644
--- a/src/being.h
+++ b/src/being.h
@@ -1039,8 +1039,8 @@ class Being : public ActorSprite, public ConfigListener
unsigned int mMoveTime;
unsigned int mAttackTime;
unsigned int mTalkTime;
- unsigned int mTestTime;
unsigned int mOtherTime;
+ unsigned int mTestTime;
bool mErased;
bool mEnemy;
std::string mIp;
diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp
index 62968d8b7..c09249f12 100644
--- a/src/chatlogger.cpp
+++ b/src/chatlogger.cpp
@@ -44,10 +44,11 @@
#include "debug.h"
ChatLogger::ChatLogger() :
- mLogDir(""),
- mBaseLogDir(""),
- mServerName(""),
- mLogFileName("")
+ mLogFile(),
+ mLogDir(),
+ mBaseLogDir(),
+ mServerName(),
+ mLogFileName()
{
}
diff --git a/src/client.cpp b/src/client.cpp
index 46f8c2310..265054e18 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -258,9 +258,19 @@ Client *Client::mInstance = nullptr;
Client::Client(const Options &options) :
gcn::ActionListener(),
mOptions(options),
- mServerConfigDir(""),
- mUsersDir(""),
- mNpcsDir(""),
+ mPackageDir(),
+ mConfigDir(),
+ mServerConfigDir(),
+ mLocalDataDir(),
+ mTempDir(),
+ mUpdateHost(),
+ mUpdatesDir(),
+ mScreenshotDir(),
+ mUsersDir(),
+ mNpcsDir(),
+ mRootDir(),
+ mServerName(),
+ mCurrentServer(),
mGame(nullptr),
mCurrentDialog(nullptr),
mQuitDialog(nullptr),
@@ -281,7 +291,9 @@ Client::Client(const Options &options) :
mInputFocused(true),
mMouseFocused(true),
mGuiAlpha(1.0f),
+ mCaption(),
mNewMessageFlag(false),
+ mFpsManager(),
mSkin(nullptr),
mButtonPadding(1),
mButtonSpacing(3)
diff --git a/src/client.h b/src/client.h
index 1a591c428..b383bc0ea 100644
--- a/src/client.h
+++ b/src/client.h
@@ -163,22 +163,31 @@ public:
*/
struct Options
{
- Options():
+ Options() :
+ username(),
+ password(),
+ character(),
+ brandingPath(),
+ updateHost(),
+ dataPath(),
+ homeDir(),
+ logFileName(),
+ chatLogDir(),
+ configDir(),
+ localDataDir(),
+ screenshotDir(),
+ test(),
+ serverName(),
+ serverPort(0),
printHelp(false),
printVersion(false),
skipUpdate(false),
chooseDefault(false),
noOpenGL(false),
safeMode(false),
- testMode(false),
- serverPort(0)
+ testMode(false)
{}
- bool printHelp;
- bool printVersion;
- bool skipUpdate;
- bool chooseDefault;
- bool noOpenGL;
std::string username;
std::string password;
std::string character;
@@ -191,12 +200,16 @@ public:
std::string configDir;
std::string localDataDir;
std::string screenshotDir;
- bool safeMode;
- bool testMode;
std::string test;
-
std::string serverName;
short serverPort;
+ bool printHelp;
+ bool printVersion;
+ bool skipUpdate;
+ bool chooseDefault;
+ bool noOpenGL;
+ bool safeMode;
+ bool testMode;
};
explicit Client(const Options &options);
@@ -360,12 +373,12 @@ private:
std::string mPackageDir;
std::string mConfigDir;
+ std::string mServerConfigDir;
std::string mLocalDataDir;
std::string mTempDir;
std::string mUpdateHost;
std::string mUpdatesDir;
std::string mScreenshotDir;
- std::string mServerConfigDir;
std::string mUsersDir;
std::string mNpcsDir;
std::string mRootDir;
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 3ac01cb5a..967f6d65d 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -29,7 +29,8 @@
#include "debug.h"
-CommandHandler::CommandHandler()
+CommandHandler::CommandHandler() :
+ mCommands()
{
const int sz = sizeof(commands) / sizeof(CommandInfo);
for (int f = 0; f < sz; f ++)
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index 9d5e057b2..a191afc59 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -49,6 +49,7 @@ static const unsigned cache_clean_part = 3;
bool CompoundSprite::mEnableDelay = true;
CompoundSprite::CompoundSprite() :
+ imagesCache(),
mCacheItem(nullptr),
mImage(nullptr),
mAlphaImage(nullptr),
@@ -58,6 +59,7 @@ CompoundSprite::CompoundSprite() :
mEnableAlphaFix(config.getBoolValue("enableAlphaFix")),
mDisableAdvBeingCaching(config.getBoolValue("disableAdvBeingCaching")),
mDisableBeingCaching(config.getBoolValue("disableBeingCaching")),
+ mSprites(),
mNextRedrawTime(0)
{
mAlpha = 1.0f;
@@ -538,7 +540,7 @@ bool CompoundSprite::updateNumber(unsigned num)
}
CompoundItem::CompoundItem() :
-// alpha(1.0f),
+ data(),
image(nullptr),
alphaImage(nullptr)
{
diff --git a/src/configuration.cpp b/src/configuration.cpp
index c65c68695..05b048408 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -315,6 +315,12 @@ void ConfigurationObject::clear()
mContainerOptions.clear();
}
+ConfigurationObject::ConfigurationObject() :
+ mOptions(),
+ mContainerOptions()
+{
+}
+
ConfigurationObject::~ConfigurationObject()
{
clear();
@@ -322,9 +328,11 @@ ConfigurationObject::~ConfigurationObject()
Configuration::Configuration() :
ConfigurationObject(),
+ mListenerMap(),
mConfigPath(),
mDefaultsData(nullptr),
mDirectory(),
+ mFilename(),
mUseResManager(false)
{
#ifdef DEBUG_CONFIG
diff --git a/src/configuration.h b/src/configuration.h
index 16c301ce4..75257687b 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -84,6 +84,8 @@ class ConfigurationObject
friend class Configuration;
public:
+ ConfigurationObject();
+
virtual ~ConfigurationObject();
/**
diff --git a/src/depricatedevent.h b/src/depricatedevent.h
index 611611bbf..c142ec0b1 100644
--- a/src/depricatedevent.h
+++ b/src/depricatedevent.h
@@ -53,7 +53,8 @@ class DepricatedEvent final
// and is to used to identify what type of event
// this is.
explicit DepricatedEvent(const DepricatedEvents name) :
- mDepricatedEventName(name)
+ mDepricatedEventName(name),
+ mData()
{ }
~DepricatedEvent();
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index ac4f80afc..52e848463 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -29,7 +29,8 @@
#include "debug.h"
-EffectManager::EffectManager()
+EffectManager::EffectManager() :
+ mEffects()
{
XML::Document doc("effects.xml");
const XmlNodePtr root = doc.rootNode();
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 4e4f9273b..7e704c615 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -70,6 +70,7 @@ Graphics::Graphics() :
mBlitMode(BLIT_NORMAL),
mRedraw(false),
mDoubleBuffer(false),
+ mRect(),
mSecure(false),
mOpenGL(0),
mEnableResize(false),
@@ -78,7 +79,8 @@ Graphics::Graphics() :
mOldAlpha(0),
mName("Software"),
mStartFreeMem(0),
- mSync(false)
+ mSync(false),
+ mColor2()
{
mRect.x = 0;
mRect.y = 0;
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 14069c0e6..7c5c94ed6 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -77,6 +77,11 @@
GraphicsManager graphicsManager;
GraphicsManager::GraphicsManager() :
+ mExtensions(),
+ mPlatformExtensions(),
+ mGlVersionString(),
+ mGlVendor(),
+ mGlRenderer(),
mMinor(0),
mMajor(0),
mPlatformMinor(0),
diff --git a/src/graphicsvertexes.cpp b/src/graphicsvertexes.cpp
index 9ee5790ac..109b4de6a 100644
--- a/src/graphicsvertexes.cpp
+++ b/src/graphicsvertexes.cpp
@@ -28,7 +28,8 @@
unsigned int vertexBufSize = 500;
#endif
-SDLGraphicsVertexes::SDLGraphicsVertexes()
+SDLGraphicsVertexes::SDLGraphicsVertexes() :
+ mList()
{
mList.reserve(30);
}
@@ -44,7 +45,12 @@ NormalOpenGLGraphicsVertexes::NormalOpenGLGraphicsVertexes() :
mFloatTexArray(nullptr),
mIntTexArray(nullptr),
mIntVertArray(nullptr),
- mShortVertArray(nullptr)
+ mShortVertArray(nullptr),
+ mVp(),
+ mFloatTexPool(),
+ mIntVertPool(),
+ mShortVertPool(),
+ mIntTexPool()
{
mFloatTexPool.reserve(30);
mIntVertPool.reserve(30);
@@ -216,7 +222,11 @@ GLint *NormalOpenGLGraphicsVertexes::continueIntTexArray()
#endif
ImageVertexes::ImageVertexes() :
- image(nullptr)
+ image(nullptr),
+#ifdef USE_OPENGL
+ ogl(),
+#endif
+ sdl()
{
sdl.reserve(30);
}
@@ -232,7 +242,8 @@ ImageCollection::ImageCollection() :
currentGLImage(0),
#endif
currentImage(nullptr),
- currentVert(nullptr)
+ currentVert(nullptr),
+ draws()
{
}
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index 09b4305c9..8934f5818 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -142,11 +142,11 @@ class ImageVertexes final
~ImageVertexes();
const Image *image;
- DoubleRects sdl;
-
#ifdef USE_OPENGL
NormalOpenGLGraphicsVertexes ogl;
#endif
+ DoubleRects sdl;
+
};
typedef std::vector<ImageVertexes*> ImageVertexesVector;
@@ -157,6 +157,8 @@ class ImageCollection final
public:
ImageCollection();
+ A_DELETE_COPY(ImageCollection)
+
~ImageCollection();
void clear();
diff --git a/src/guild.cpp b/src/guild.cpp
index 09ff80cc7..5e6b5cc2e 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -77,9 +77,12 @@ std::string GuildMember::getAdditionString() const
Guild::GuildMap Guild::guilds;
Guild::Guild(const short id):
+ mMembers(),
+ mName(),
mId(id),
mCanInviteUsers(false),
mEmblemId(0),
+ mPositions(),
mServerGuild(true)
{
guilds[id] = this;
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index 765c86a4c..da11ece1b 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -46,6 +46,7 @@ GuildManager::GuildManager() :
mSentInfoRequest(false),
mSentNameRequest(false),
mHavePower(false),
+ mTempList(),
mTab(nullptr),
mRequest(false),
mRequestTime(cur_time + 3),
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 0a82aae7b..abdc92723 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -47,6 +47,7 @@ struct SlotUsed final : public std::unary_function<Item*, bool>
};
Inventory::Inventory(const int type, const int size) :
+ mInventoryListeners(),
mType(type),
mSize(size == -1 ? static_cast<unsigned>(
Net::getInventoryHandler()->getSize(type))
diff --git a/src/item.cpp b/src/item.cpp
index aa58b4167..d6c804314 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -36,6 +36,8 @@ extern int serverVersion;
Item::Item(const int id, const int quantity, const int refine,
const unsigned char color, const bool equipment,
const bool equipped):
+ mId(0),
+ mColor(0),
mQuantity(quantity),
mImage(nullptr),
mDrawImage(nullptr),
@@ -43,7 +45,9 @@ Item::Item(const int id, const int quantity, const int refine,
mEquipped(equipped),
mInEquipment(false),
mRefine(refine),
- mInvIndex(0)
+ mInvIndex(0),
+ mDescription(),
+ mTags()
{
setId(id, color);
}
diff --git a/src/joystick.cpp b/src/joystick.cpp
index 0c78621d3..1527cd544 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -44,7 +44,10 @@ Joystick::Joystick(const int no):
mCalibrated(false),
mButtonsNumber(MAX_BUTTONS),
mUseInactive(false),
- mHaveHats(false)
+ mHaveHats(false),
+ mKeyToAction(),
+ mKeyToId(),
+ mKeyTimeMap()
{
for (int i = 0; i < MAX_BUTTONS; i++)
mActiveButtons[i] = false;
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 132158eb1..02de194cb 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -38,7 +38,10 @@ KeyboardConfig::KeyboardConfig() :
mEnabled(true),
mActiveKeys(nullptr),
mActiveKeys2(nullptr),
- mRepeatTime(0)
+ mRepeatTime(0),
+ mKeyToAction(),
+ mKeyToId(),
+ mKeyTimeMap()
{
}
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 774061137..d19a79eae 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -112,6 +112,7 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
mDisableGameModifiers(config.getBoolValue("disableGameModifiers")),
mLastTargetX(0),
mLastTargetY(0),
+ mHomes(),
mTarget(nullptr),
mPlayerFollowed(""),
mPlayerImitated(""),
@@ -123,7 +124,9 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
mLastAction(-1),
mWalkingDir(0),
mPathSetByMouse(false),
+ mStatusEffectIcons(),
mLocalWalkTime(-1),
+ mMessages(),
mMessageTime(0),
mAwayListener(new AwayListener),
mAwayDialog(nullptr),
@@ -150,6 +153,7 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
mOldY(0),
mOldTileX(0),
mOldTileY(0),
+ mNavigatePath(),
mTargetDeadPlayers(config.getBoolValue("targetDeadPlayers")),
mServerAttack(config.getBoolValue("serverAttack")),
mLastHitFrom(""),
diff --git a/src/logger.cpp b/src/logger.cpp
index 2ca474730..e58e8f9eb 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -66,7 +66,8 @@
<< static_cast<int>((tv.tv_usec / 10000) % 100) \
<< "] ";
-Logger::Logger():
+Logger::Logger() :
+ mLogFile(),
mLogToStandardOut(true),
mChatWindow(nullptr),
mDebugLog(false)
diff --git a/src/map.cpp b/src/map.cpp
index ccda5e5d7..a0fbab932 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -86,6 +86,7 @@ class ActorFunctuator final
} actorCompare;
TileAnimation::TileAnimation(Animation *const ani):
+ mAffected(),
mAnimation(new SimpleAnimation(ani)),
mLastImage(nullptr)
{
@@ -128,10 +129,20 @@ Map::Map(const int width, const int height,
mMaxTileHeight(height),
mMetaTiles(new MetaTile[mWidth * mHeight]),
mWalkLayer(nullptr),
+ mLayers(),
+ mTilesets(),
+ mActors(),
mHasWarps(false),
mDebugFlags(MAP_NORMAL),
- mOnClosedList(1), mOnOpenList(2),
- mLastAScrollX(0.0f), mLastAScrollY(0.0f),
+ mOnClosedList(1),
+ mOnOpenList(2),
+ mBackgrounds(),
+ mForegrounds(),
+ mLastAScrollX(0.0f),
+ mLastAScrollY(0.0f),
+ particleEffects(),
+ mMapPortals(),
+ mTileAnimations(),
mOverlayDetail(config.getIntValue("OverlayDetail")),
mOpacity(config.getFloatValue("guialpha")),
#ifdef USE_OPENGL
diff --git a/src/map.h b/src/map.h
index 07354623d..a9c2ee5dd 100644
--- a/src/map.h
+++ b/src/map.h
@@ -470,18 +470,27 @@ class Map final : public Properties, public ConfigListener
int mDebugFlags;
// Pathfinding members
- unsigned mOnClosedList, mOnOpenList;
+ unsigned int mOnClosedList;
+ unsigned int mOnOpenList;
// Overlay data
AmbientLayerVector mBackgrounds;
AmbientLayerVector mForegrounds;
float mLastAScrollX;
float mLastAScrollY;
-// bool mSpritesUpdated;
// Particle effect data
struct ParticleEffectData
{
+ ParticleEffectData() :
+ file(),
+ x(0),
+ y(0),
+ w(0),
+ h(0)
+ {
+ }
+
std::string file;
int x;
int y;
diff --git a/src/maplayer.cpp b/src/maplayer.cpp
index 315e9a342..af1a6c165 100644
--- a/src/maplayer.cpp
+++ b/src/maplayer.cpp
@@ -49,7 +49,8 @@ MapLayer::MapLayer(const int x, const int y, const int width, const int height,
mHighlightAttackRange(config.getBoolValue("highlightAttackRange")),
mTiles(new Image*[mWidth * mHeight]),
mSpecialLayer(nullptr),
- mTempLayer(nullptr)
+ mTempLayer(nullptr),
+ mTempRows()
{
std::fill_n(mTiles, mWidth * mHeight, static_cast<Image*>(nullptr));
@@ -555,12 +556,12 @@ int MapLayer::getTileDrawWidth(const Image *img,
SpecialLayer::SpecialLayer(const int width, const int height,
const bool drawSprites) :
- mWidth(width), mHeight(height),
- mDrawSprites(drawSprites)
+ mWidth(width),
+ mHeight(height),
+ mDrawSprites(drawSprites),
+ mTiles(new MapItem*[mWidth * mHeight])
{
- const int size = mWidth * mHeight;
- mTiles = new MapItem*[size];
- std::fill_n(mTiles, size, static_cast<MapItem*>(nullptr));
+ std::fill_n(mTiles, mWidth * mHeight, static_cast<MapItem*>(nullptr));
}
SpecialLayer::~SpecialLayer()
@@ -675,26 +676,26 @@ void SpecialLayer::draw(Graphics *const graphics, int startX, int startY,
}
MapItem::MapItem():
- mImage(nullptr), mComment(""), mName(""), mX(-1), mY(-1)
+ mType(EMPTY), mImage(nullptr), mComment(""), mName(""), mX(-1), mY(-1)
{
setType(EMPTY);
}
MapItem::MapItem(const int type):
- mImage(nullptr), mComment(""), mName(""), mX(-1), mY(-1)
+ mType(type), mImage(nullptr), mComment(""), mName(""), mX(-1), mY(-1)
{
setType(type);
}
MapItem::MapItem(const int type, std::string comment):
- mImage(nullptr), mComment(comment), mName(""), mX(-1), mY(-1)
+ mType(type), mImage(nullptr), mComment(comment), mName(""), mX(-1), mY(-1)
{
setType(type);
}
MapItem::MapItem(const int type, std::string comment,
const int x, const int y):
- mImage(nullptr), mComment(comment), mName(""), mX(x), mY(y)
+ mType(type), mImage(nullptr), mComment(comment), mName(""), mX(x), mY(y)
{
setType(type);
}
@@ -792,11 +793,11 @@ void MapItem::draw(Graphics *const graphics, const int x, const int y,
}
ObjectsLayer::ObjectsLayer(const unsigned width, const unsigned height) :
- mWidth(width), mHeight(height)
+ mTiles(new MapObjectList*[width * height]),
+ mWidth(width),
+ mHeight(height)
{
- const unsigned size = width * height;
- mTiles = new MapObjectList*[size];
- std::fill_n(mTiles, size, static_cast<MapObjectList*>(nullptr));
+ std::fill_n(mTiles, width * height, static_cast<MapObjectList*>(nullptr));
}
ObjectsLayer::~ObjectsLayer()
diff --git a/src/maplayer.h b/src/maplayer.h
index d934817b0..ff9c4f6db 100644
--- a/src/maplayer.h
+++ b/src/maplayer.h
@@ -41,7 +41,8 @@ typedef std::vector<ImageVertexes*> MepRowImages;
class MapRowVertexes final
{
public:
- MapRowVertexes()
+ MapRowVertexes() :
+ images()
{
images.reserve(30);
}
@@ -68,8 +69,10 @@ class MapObject final
class MapObjectList final
{
public:
- MapObjectList()
- { }
+ MapObjectList() :
+ objects()
+ {
+ }
A_DELETE_COPY(MapObjectList)
diff --git a/src/mobileopenglgraphics.cpp b/src/mobileopenglgraphics.cpp
index f447655e4..7280e880b 100644
--- a/src/mobileopenglgraphics.cpp
+++ b/src/mobileopenglgraphics.cpp
@@ -54,14 +54,15 @@ MobileOpenGLGraphics::MobileOpenGLGraphics():
mAlpha(false),
mTexture(false),
mIsByteColor(false),
+ mByteColor(),
mFloatColor(1.0f),
mMaxVertices(500),
-#ifdef DEBUG_BIND_TEXTURE
mColorAlpha(false),
- mOldTextureId(0)
-#else
- mColorAlpha(false)
+#ifdef DEBUG_BIND_TEXTURE
+ mOldTexture(),
+ mOldTextureId(0),
#endif
+ mFbo()
{
mOpenGL = 3;
mName = "mobile OpenGL";
diff --git a/src/mobileopenglgraphics.h b/src/mobileopenglgraphics.h
index f48e625f4..9c813dee2 100644
--- a/src/mobileopenglgraphics.h
+++ b/src/mobileopenglgraphics.h
@@ -215,11 +215,11 @@ class MobileOpenGLGraphics final : public Graphics
float mFloatColor;
int mMaxVertices;
bool mColorAlpha;
- FBOInfo mFbo;
#ifdef DEBUG_BIND_TEXTURE
std::string mOldTexture;
unsigned mOldTextureId;
#endif
+ FBOInfo mFbo;
};
#endif
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index 3e8fa629d..27eebc3fb 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -35,7 +35,8 @@
#include "debug.h"
MumbleManager::MumbleManager() :
- mLinkedMem(nullptr)
+ mLinkedMem(nullptr),
+ mLinkedMemCache()
{
mMapBase[0] = mMapBase[1] = mMapBase[2] = 0.;
init();
diff --git a/src/normalopenglgraphics.cpp b/src/normalopenglgraphics.cpp
index 5fffebbc0..90ba0a188 100644
--- a/src/normalopenglgraphics.cpp
+++ b/src/normalopenglgraphics.cpp
@@ -52,14 +52,15 @@ NormalOpenGLGraphics::NormalOpenGLGraphics():
mAlpha(false),
mTexture(false),
mIsByteColor(false),
+ mByteColor(),
mFloatColor(1.0f),
mMaxVertices(500),
-#ifdef DEBUG_BIND_TEXTURE
mColorAlpha(false),
- mOldTextureId(0)
-#else
- mColorAlpha(false)
+#ifdef DEBUG_BIND_TEXTURE
+ mOldTexture(),
+ mOldTextureId(0),
#endif
+ mFbo()
{
mOpenGL = 1;
mName = "fast OpenGL";
diff --git a/src/normalopenglgraphics.h b/src/normalopenglgraphics.h
index 9cff529dc..f33b1fb97 100644
--- a/src/normalopenglgraphics.h
+++ b/src/normalopenglgraphics.h
@@ -222,11 +222,11 @@ class NormalOpenGLGraphics final : public Graphics
float mFloatColor;
int mMaxVertices;
bool mColorAlpha;
- FBOInfo mFbo;
#ifdef DEBUG_BIND_TEXTURE
std::string mOldTexture;
unsigned mOldTextureId;
#endif
+ FBOInfo mFbo;
};
#endif
diff --git a/src/particle.cpp b/src/particle.cpp
index 3edee622d..e7feb26d8 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -64,9 +64,13 @@ Particle::Particle(Map *const map) :
mLifetimePast(0),
mFadeOut(0),
mFadeIn(0),
+ mVelocity(),
mAlive(ALIVE),
mAutoDelete(true),
+ mChildEmitters(),
+ mChildParticles(),
mAllowSizeAdjust(false),
+ mDeathEffect(),
mDeathEffectConditions(0x00),
mGravity(0.0f),
mRandomness(0),
diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
index efab44619..26f7b5403 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.cpp
@@ -62,7 +62,8 @@ void ParticleContainer::moveTo(const float x, const float y)
ParticleList::ParticleList(ParticleContainer *const parent,
const bool delParent) :
- ParticleContainer(parent, delParent)
+ ParticleContainer(parent, delParent),
+ mElements()
{}
ParticleList::~ParticleList()
@@ -129,7 +130,8 @@ void ParticleList::moveTo(const float x, const float y)
ParticleVector::ParticleVector(ParticleContainer *const parent,
const bool delParent) :
- ParticleContainer(parent, delParent)
+ ParticleContainer(parent, delParent),
+ mIndexedElements()
{}
ParticleVector::~ParticleVector()
diff --git a/src/party.cpp b/src/party.cpp
index a013e945b..48cdfed56 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -60,6 +60,8 @@ PartyMember::PartyMember(Party *const party, const int id,
Party::PartyMap Party::parties;
Party::Party(const short id) :
+ mMembers(),
+ mName(),
mId(id),
mCanInviteUsers(false)
{
diff --git a/src/playerinfo.h b/src/playerinfo.h
index 2fec7d960..8e6630adc 100644
--- a/src/playerinfo.h
+++ b/src/playerinfo.h
@@ -47,6 +47,13 @@ typedef std::map<int, Stat> StatMap;
*/
struct PlayerInfoBackend final
{
+ PlayerInfoBackend() :
+ mAttributes(),
+ mStats(),
+ mSkills()
+ {
+ }
+
IntMap mAttributes;
StatMap mStats;
IntMap mSkills;
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 6cd46d2bb..7a24a4b95 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -130,7 +130,10 @@ PlayerRelation::PlayerRelation(const Relation relation) :
PlayerRelationsManager::PlayerRelationsManager() :
mPersistIgnores(false),
mDefaultPermissions(PlayerRelation::DEFAULT),
- mIgnoreStrategy(nullptr)
+ mIgnoreStrategy(nullptr),
+ mRelations(),
+ mListeners(),
+ mIgnoreStrategies()
{
}
diff --git a/src/playerrelations.h b/src/playerrelations.h
index 8ca7454b2..96dfb7eb6 100644
--- a/src/playerrelations.h
+++ b/src/playerrelations.h
@@ -79,6 +79,14 @@ class PlayerIgnoreStrategy
std::string mDescription;
std::string mShortName;
+ PlayerIgnoreStrategy() :
+ mDescription(),
+ mShortName()
+ {
+ }
+
+ A_DELETE_COPY(PlayerIgnoreStrategy)
+
virtual ~PlayerIgnoreStrategy()
{ }
diff --git a/src/properties.h b/src/properties.h
index fac343b17..8ca9976e8 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -35,6 +35,11 @@
class Properties
{
public:
+ Properties() :
+ mProperties()
+ {
+ }
+
/**
* Destructor.
*/
diff --git a/src/safeopenglgraphics.cpp b/src/safeopenglgraphics.cpp
index 613c136a5..35748f539 100644
--- a/src/safeopenglgraphics.cpp
+++ b/src/safeopenglgraphics.cpp
@@ -43,8 +43,10 @@ SafeOpenGLGraphics::SafeOpenGLGraphics():
mAlpha(false),
mTexture(false),
mIsByteColor(false),
+ mByteColor(),
mFloatColor(1.0f),
- mColorAlpha(false)
+ mColorAlpha(false),
+ mFbo()
{
mOpenGL = 2;
mName = "safe OpenGL";
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index f1fb42b79..af773bb2a 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -34,7 +34,9 @@ ShopItem::ShopItem(const int inventoryIndex, const int id,
const int quantity, const int price) :
Item(id, 0, 0, color),
mPrice(price),
- mShowQuantity(true)
+ mDisplayName(),
+ mShowQuantity(true),
+ mDuplicates()
{
if (serverVersion > 0)
{
@@ -56,7 +58,9 @@ ShopItem::ShopItem(const int inventoryIndex, const int id,
ShopItem::ShopItem(const int id, const unsigned char color, const int price) :
Item(id, 0, 0, color),
mPrice(price),
- mShowQuantity(false)
+ mDisplayName(),
+ mShowQuantity(false),
+ mDuplicates()
{
if (serverVersion > 0)
{
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index 83f9c0a72..72a7d26c2 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -49,9 +49,11 @@ static void fadeOutCallBack()
}
SoundManager::SoundManager():
+ mNextMusicFile(),
mInstalled(false),
mSfxVolume(100),
mMusicVolume(60),
+ mCurrentMusicFile(),
mMusic(nullptr),
mPlayBattle(false),
mPlayGui(false),
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 03c73a59d..bad5cd78b 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -35,7 +35,9 @@
#include "debug.h"
-SpellManager::SpellManager()
+SpellManager::SpellManager() :
+ mSpells(),
+ mSpellsVector()
{
load();
}
diff --git a/src/sprite.h b/src/sprite.h
index 8a25d11c8..8fb78b248 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -32,6 +32,11 @@ class Image;
class Sprite
{
public:
+ Sprite() :
+ mAlpha()
+ {
+ }
+
virtual ~Sprite()
{ }
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index 167bbb17f..7d00eb5ab 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -40,6 +40,11 @@ static void unloadMap(std::map<int, StatusEffect *> &map);
bool StatusEffect::mLoaded = false;
StatusEffect::StatusEffect() :
+ mMessage(),
+ mSFXEffect(),
+ mParticleEffect(),
+ mIcon(),
+ mAction(),
mPersistentParticleEffect(false)
{
}
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index 0eadbdba0..626ac7490 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -46,7 +46,8 @@
#include "debug.h"
TestLauncher::TestLauncher(std::string test) :
- mTest(test)
+ mTest(test),
+ file()
{
file.open((Client::getLocalDataDirectory()
+ std::string("/test.log")).c_str(), std::ios::out);
diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp
index 6193036d9..81e83a950 100644
--- a/src/test/testmain.cpp
+++ b/src/test/testmain.cpp
@@ -38,7 +38,8 @@ std::string fileName;
extern char *selfName;
TestMain::TestMain() :
- log(new Logger)
+ log(new Logger),
+ mConfig()
{
fileName = getSelfName();
log->setLogFile(Client::getLocalDataDirectory()
diff --git a/src/text.cpp b/src/text.cpp
index 07041afd9..687700193 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -45,9 +45,11 @@ Text::Text(const std::string &text, const int x, const int y,
const gcn::Color* color, const bool isSpeech,
gcn::Font *const font) :
mFont(font ? font : gui->getFont()),
+ mX(x),
mY(y),
mWidth(mFont->getWidth(text)),
mHeight(mFont->getHeight()),
+ mXOffset(0),
mText(text),
mColor(color),
mOutlineColor(Theme::getThemeColor(Theme::OUTLINE)),
diff --git a/src/textmanager.cpp b/src/textmanager.cpp
index 19bd29d5d..949867fa3 100644
--- a/src/textmanager.cpp
+++ b/src/textmanager.cpp
@@ -29,7 +29,8 @@
TextManager *textManager = nullptr;
-TextManager::TextManager()
+TextManager::TextManager() :
+ mTextList()
{
}
diff --git a/src/tileset.h b/src/tileset.h
index 6d9891591..5ef3f6a23 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -39,7 +39,8 @@ class Tileset final : public ImageSet
Tileset(Image *const img, const int w, const int h, const int firstGid,
const int margin, const int spacing):
ImageSet(img, w, h, margin, spacing),
- mFirstGid(firstGid)
+ mFirstGid(firstGid),
+ mProperties()
{
}
diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index 4dbffdf06..8ffb8edb1 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -38,6 +38,7 @@ extern int openGLMode;
TouchManager::TouchManager() :
mKeyboard(nullptr),
mPad(nullptr),
+ mObjects(),
mVertexes(new ImageCollection),
mRedraw(true),
mShowJoystick(false),