From 9fe21fcd8883b37bdc30224822e6e42afb35b8f0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 7 Feb 2016 16:18:13 +0300
Subject: Replace most static_cast<Type> to shorter versions from defines.
---
src/actions/actions.cpp | 6 +++---
src/actions/commands.cpp | 6 +++---
src/actions/pets.cpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'src/actions')
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 472ea2b6d..a7289e300 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -398,7 +398,7 @@ impHandler(shortcut)
if (itemShortcutWindow)
{
const int num = itemShortcutWindow->getTabIndex();
- if (num >= 0 && num < static_cast<int>(SHORTCUT_TABS))
+ if (num >= 0 && num < CAST_S32(SHORTCUT_TABS))
{
if (itemShortcut[num])
{
@@ -1120,7 +1120,7 @@ impHandler0(cacheInfo)
{
if (!cache[f].size)
{
- const unsigned int sz = static_cast<int>(cache[f].size);
+ const unsigned int sz = CAST_S32(cache[f].size);
all += sz;
str.append(strprintf("%d: %u, ", f, sz));
}
@@ -1683,7 +1683,7 @@ impHandler0(testInfo)
{
if (actorManager)
{
- logger->log("actors count: %d", static_cast<int>(
+ logger->log("actors count: %d", CAST_S32(
actorManager->size()));
return true;
}
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 4b967c873..b9482ba32 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -392,7 +392,7 @@ impHandler(commandEmote)
{
if (localPlayer)
{
- localPlayer->emote(static_cast<uint8_t>(atoi(event.args.c_str())));
+ localPlayer->emote(CAST_U8(atoi(event.args.c_str())));
return true;
}
return false;
@@ -965,7 +965,7 @@ impHandler(commandHomunEmote)
if (homunculusHandler)
{
- homunculusHandler->emote(static_cast<uint8_t>(
+ homunculusHandler->emote(CAST_U8(
atoi(event.args.c_str())));
return true;
}
@@ -1100,7 +1100,7 @@ impHandler(skill)
StringVect vect;
splitToStringVector(vect, event.args, ' ');
- const int sz = static_cast<int>(vect.size());
+ const int sz = CAST_S32(vect.size());
if (sz < 1)
return true;
const int skillId = atoi(vect[0].c_str());
diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp
index d69618356..84b3d412d 100644
--- a/src/actions/pets.cpp
+++ b/src/actions/pets.cpp
@@ -82,7 +82,7 @@ static const Being *getPet()
impHandler(commandEmotePet)
{
// need use actual pet id
- petHandler->emote(static_cast<uint8_t>(
+ petHandler->emote(CAST_U8(
atoi(event.args.c_str())), 0);
return true;
}
--
cgit v1.2.3-70-g09d2