From 378cef9bda1c4c7e74ab24680fff19ce6e9326a4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 10 Oct 2012 22:18:18 +0300 Subject: Fix code style. --- src/net/eathena/network.cpp | 2 +- src/net/tmwa/network.cpp | 2 +- src/resources/emotedb.h | 3 ++- src/resources/music.h | 3 ++- src/resources/specialdb.h | 12 +++++++++++- 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 #include +#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); -- cgit v1.2.3-70-g09d2