summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-10 22:18:18 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-10 22:18:18 +0300
commit378cef9bda1c4c7e74ab24680fff19ce6e9326a4 (patch)
tree9af7c997614e96fa4118d2e74ce9262c252e82d7
parentaae328e272cdec136a1367cf83a5873a6b4963a9 (diff)
downloadmanaplus-378cef9bda1c4c7e74ab24680fff19ce6e9326a4.tar.gz
manaplus-378cef9bda1c4c7e74ab24680fff19ce6e9326a4.tar.bz2
manaplus-378cef9bda1c4c7e74ab24680fff19ce6e9326a4.tar.xz
manaplus-378cef9bda1c4c7e74ab24680fff19ce6e9326a4.zip
Fix code style.
-rw-r--r--src/net/eathena/network.cpp2
-rw-r--r--src/net/tmwa/network.cpp2
-rw-r--r--src/resources/emotedb.h3
-rw-r--r--src/resources/music.h3
-rw-r--r--src/resources/specialdb.h12
5 files changed, 17 insertions, 5 deletions
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index a240a3a74..ef772248f 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -243,7 +243,7 @@ MessageIn *Network::getNextMessage()
msgId, len));
#endif
- MessageIn *msg = new MessageIn(mInBuffer, len);
+ MessageIn *const msg = new MessageIn(mInBuffer, len);
SDL_mutexV(mMutex);
return msg;
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 278f8e2fd..c8c28e0d2 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -221,7 +221,7 @@ MessageIn *Network::getNextMessage()
// msgId, len));
#endif
- MessageIn *msg = new MessageIn(mInBuffer, len);
+ MessageIn *const msg = new MessageIn(mInBuffer, len);
SDL_mutexV(mMutex);
return msg;
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index e2d621a7f..1083980e2 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -33,7 +33,8 @@ class AnimatedSprite;
struct EmoteSprite final
{
- EmoteSprite()
+ EmoteSprite() :
+ sprite(nullptr)
{ }
A_DELETE_COPY(EmoteSprite);
diff --git a/src/resources/music.h b/src/resources/music.h
index 96ad32981..0e459c724 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -35,7 +35,8 @@
class Music final : public Resource
{
public:
- Music()
+ Music() :
+ mMusic(nullptr)
{ }
A_DELETE_COPY(Music);
diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h
index d478f654b..9a01cf7d2 100644
--- a/src/resources/specialdb.h
+++ b/src/resources/specialdb.h
@@ -25,9 +25,19 @@
#include <string>
#include <map>
+#include "localconsts.h"
+
struct SpecialInfo final
{
- SpecialInfo()
+ SpecialInfo() :
+ id(0),
+ isActive(false),
+ TargetMode(TARGET_SELF),
+ hasLevel(false),
+ level(0),
+ hasRechargeBar(false),
+ rechargeNeeded(0),
+ rechargeCurrent(0)
{ }
A_DELETE_COPY(SpecialInfo);