summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-18 18:52:07 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-18 18:52:07 +0300
commit5c8280e7cd91cb30a0717714f6a0672805f5dd08 (patch)
tree84a83b2fe616b8194d89172d821ac62bb69b0a25 /src
parent860e9114723f279ee1f79ed04d308d7af5fbd887 (diff)
downloadmv-5c8280e7cd91cb30a0717714f6a0672805f5dd08.tar.gz
mv-5c8280e7cd91cb30a0717714f6a0672805f5dd08.tar.bz2
mv-5c8280e7cd91cb30a0717714f6a0672805f5dd08.tar.xz
mv-5c8280e7cd91cb30a0717714f6a0672805f5dd08.zip
fix code style.
Diffstat (limited to 'src')
-rw-r--r--src/gui/windows/updaterwindow.h2
-rw-r--r--src/net/tmwa/npchandler.cpp3
-rw-r--r--src/resources/dye.cpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index 210b01bda..e15a6d9e8 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -141,7 +141,7 @@ class UpdaterWindow final : public Window,
static void removeUpdateFile(const ResourceManager *const resman,
const std::string &restrict path,
const std::string &restrict fixPath,
- const std::string &filerestrict );
+ const std::string &filerestrict);
static void loadManaPlusUpdates(const std::string &dir,
const ResourceManager *const resman);
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 18191769f..1356dbf8c 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -346,7 +346,8 @@ void NpcHandler::processLangReuqest(Net::MessageIn &msg A_UNUSED,
stringInput(npcId, getLangSimple());
}
-void NpcHandler::processChangeTitle(Net::MessageIn &msg, const int npcId) const
+void NpcHandler::processChangeTitle(Net::MessageIn &msg,
+ const int npcId A_UNUSED) const
{
const std::string str = msg.readString();
if (mDialog)
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 68364dc52..67d32993f 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -197,7 +197,8 @@ void DyePalette::getColor(double intensity, int color[3]) const
color[2] = static_cast<int>(rest * b1 + intensity * b2);
}
-void DyePalette::replaceSColor(uint32_t *restrict pixels, const int bufSize) const
+void DyePalette::replaceSColor(uint32_t *restrict pixels,
+ const int bufSize) const
{
std::vector<DyeColor>::const_iterator it_end = mColors.end();
const int sz = mColors.size();