summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp52
-rw-r--r--src/being/castingeffect.cpp4
-rw-r--r--src/being/compoundsprite.cpp6
-rw-r--r--src/being/localplayer.cpp18
-rw-r--r--src/being/playerinfo.cpp8
5 files changed, 44 insertions, 44 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index d43912258..7fc270b22 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -346,16 +346,16 @@ Being::~Being()
mSpriteDraw = nullptr;
for_each_badges()
- delete2(mBadges[f]);
-
- delete2(mSpeechBubble);
- delete2(mDispName);
- delete2(mText);
- delete2(mEmotionSprite);
- delete2(mAnimationEffect);
- delete2(mCastingEffect);
+ delete2(mBadges[f])
+
+ delete2(mSpeechBubble)
+ delete2(mDispName)
+ delete2(mText)
+ delete2(mEmotionSprite)
+ delete2(mAnimationEffect)
+ delete2(mCastingEffect)
mBadgesCount = 0;
- delete2(mChat);
+ delete2(mChat)
removeHorse();
removeAllItemsParticles();
@@ -509,7 +509,7 @@ void Being::setSubtype(const BeingTypeId subtype,
case ActorType::FloorItem:
default:
reportAlways("Wrong being type %d in setSubType",
- CAST_S32(mType));
+ CAST_S32(mType))
break;
}
}
@@ -1117,7 +1117,7 @@ void Being::handleSkill(Being *restrict const victim,
void Being::showNameBadge(const bool show) restrict2
{
- delete2(mBadges[BadgeIndex::Name]);
+ delete2(mBadges[BadgeIndex::Name])
if (show &&
!mName.empty() &&
mShowBadges != BadgeDrawType::Hide)
@@ -1177,7 +1177,7 @@ void Being::setShowName(const bool doShowName) restrict2
void Being::showGuildBadge(const bool show) restrict2
{
- delete2(mBadges[BadgeIndex::Guild]);
+ delete2(mBadges[BadgeIndex::Guild])
if (show &&
!mGuildName.empty() &&
mShowBadges != BadgeDrawType::Hide)
@@ -1204,7 +1204,7 @@ void Being::setGuildName(const std::string &restrict name) restrict2
void Being::showClanBadge(const bool show) restrict2
{
- delete2(mBadges[BadgeIndex::Clan]);
+ delete2(mBadges[BadgeIndex::Clan])
if (show &&
!mClanName.empty() &&
mShowBadges != BadgeDrawType::Hide)
@@ -1860,7 +1860,7 @@ void Being::logic() restrict2
if (A_UNLIKELY(mCastEndTime != 0 && mCastEndTime < tick_time))
{
mCastEndTime = 0;
- delete2(mCastingEffect);
+ delete2(mCastingEffect)
}
if (A_UNLIKELY(mAnimationEffect))
@@ -2580,7 +2580,7 @@ void Being::showName() restrict2
if (mName.empty())
return;
- delete2(mDispName);
+ delete2(mDispName)
if (mHideErased && playerRelations.getRelation(mName) == Relation::ERASED)
return;
@@ -3645,7 +3645,7 @@ void Being::setGender(const GenderT gender) restrict2
void Being::showGmBadge(const bool show) restrict2
{
- delete2(mBadges[BadgeIndex::Gm]);
+ delete2(mBadges[BadgeIndex::Gm])
if (show &&
mIsGM &&
mShowBadges != BadgeDrawType::Hide &&
@@ -4945,7 +4945,7 @@ void Being::removeSpecialEffect() restrict2
mChildParticleEffects.removeLocally(mSpecialParticle);
mSpecialParticle = nullptr;
}
- delete2(mAnimationEffect);
+ delete2(mAnimationEffect)
}
void Being::updateAwayEffect() restrict2
@@ -5023,7 +5023,7 @@ void Being::setTileCoords(const int x, const int y) restrict2
void Being::setMap(Map *restrict const map) restrict2
{
mCastEndTime = 0;
- delete2(mCastingEffect);
+ delete2(mCastingEffect)
ActorSprite::setMap(map);
if (mMap != nullptr)
{
@@ -5196,7 +5196,7 @@ void Being::setTeamId(const uint16_t teamId) restrict2
void Being::showTeamBadge(const bool show) restrict2
{
- delete2(mBadges[BadgeIndex::Team]);
+ delete2(mBadges[BadgeIndex::Team])
if (show &&
mTeamId != 0U &&
mShowBadges != BadgeDrawType::Hide)
@@ -5225,7 +5225,7 @@ void Being::showBadges(const bool show) restrict2
void Being::showPartyBadge(const bool show) restrict2
{
- delete2(mBadges[BadgeIndex::Party]);
+ delete2(mBadges[BadgeIndex::Party])
if (show &&
!mPartyName.empty() &&
mShowBadges != BadgeDrawType::Hide)
@@ -5254,7 +5254,7 @@ void Being::setPartyName(const std::string &restrict name) restrict2
void Being::showShopBadge(const bool show) restrict2
{
- delete2(mBadges[BadgeIndex::Shop]);
+ delete2(mBadges[BadgeIndex::Shop])
if (show &&
mShop &&
mShowBadges != BadgeDrawType::Hide)
@@ -5273,7 +5273,7 @@ void Being::showShopBadge(const bool show) restrict2
void Being::showInactiveBadge(const bool show) restrict2
{
- delete2(mBadges[BadgeIndex::Inactive]);
+ delete2(mBadges[BadgeIndex::Inactive])
if (show &&
mInactive &&
mShowBadges != BadgeDrawType::Hide)
@@ -5292,7 +5292,7 @@ void Being::showInactiveBadge(const bool show) restrict2
void Being::showAwayBadge(const bool show) restrict2
{
- delete2(mBadges[BadgeIndex::Away]);
+ delete2(mBadges[BadgeIndex::Away])
if (show &&
mAway &&
mShowBadges != BadgeDrawType::Hide)
@@ -5382,7 +5382,7 @@ void Being::addCast(const int dstX,
SkillData *const data = skillDialog->getSkillDataByLevel(
skillId,
skillLevel);
- delete2(mCastingEffect);
+ delete2(mCastingEffect)
if (data != nullptr)
{
const std::string castingAnimation = data->castingAnimation;
@@ -5397,7 +5397,7 @@ void Being::addCast(const int dstX,
else
{
reportAlways("Want to draw casting for unknown skill %d",
- skillId);
+ skillId)
}
}
@@ -5556,7 +5556,7 @@ void Being::setLanguageId(const int lang) restrict2 noexcept2
{
if (lang != mLanguageId)
{
- delete2(mBadges[BadgeIndex::Lang]);
+ delete2(mBadges[BadgeIndex::Lang])
const std::string &badge = LanguageDb::getIcon(lang);
if (!badge.empty())
{
diff --git a/src/being/castingeffect.cpp b/src/being/castingeffect.cpp
index aa3e6a14d..17b0b177f 100644
--- a/src/being/castingeffect.cpp
+++ b/src/being/castingeffect.cpp
@@ -60,13 +60,13 @@ CastingEffect::CastingEffect(const int skillId,
reportAlways("Skill %d/%d casting animation '%s' load failed",
skillId,
skillLevel,
- animation.c_str());
+ animation.c_str())
}
}
CastingEffect::~CastingEffect()
{
- delete2(mSprite);
+ delete2(mSprite)
}
void CastingEffect::draw(Graphics *const graphics,
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 843c3b6b6..ebb4466b3 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -290,7 +290,7 @@ void CompoundSprite::removeSprite(const int layer)
if (mSprites[layer] == nullptr)
return;
- delete2(mSprites[layer]);
+ delete2(mSprites[layer])
mNeedsRedraw = true;
}
@@ -305,7 +305,7 @@ void CompoundSprite::clear()
mNeedsRedraw = true;
delete_all(imagesCache);
imagesCache.clear();
- delete2(mCacheItem);
+ delete2(mCacheItem)
mLastTime = 0;
}
@@ -368,7 +368,7 @@ void CompoundSprite::redraw() const
drawSpritesSDL(graphics, posX, posY);
- delete2(graphics);
+ delete2(graphics)
SDL_SetAlpha(surface, 0, SDL_ALPHA_OPAQUE);
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index d344926fa..ce0ab1e27 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -238,7 +238,7 @@ LocalPlayer::~LocalPlayer()
soundManager.volumeRestore();
delete2(mAwayDialog)
}
- delete2(mAwayListener);
+ delete2(mAwayListener)
}
void LocalPlayer::logic()
@@ -404,7 +404,7 @@ void LocalPlayer::setAction(const BeingActionT &action,
{
// TRANSLATORS: chat message after death
debugMsg(strprintf(_("You were killed by %s."),
- mLastHitFrom.c_str()));
+ mLastHitFrom.c_str()))
mLastHitFrom.clear();
}
setTarget(nullptr);
@@ -2340,12 +2340,12 @@ void LocalPlayer::setFollow(const std::string &player)
{
// TRANSLATORS: follow command message
std::string msg = strprintf(_("Follow: %s"), player.c_str());
- debugMsg(msg);
+ debugMsg(msg)
}
else
{
// TRANSLATORS: follow command message
- debugMsg(_("Follow canceled"));
+ debugMsg(_("Follow canceled"))
}
}
@@ -2356,12 +2356,12 @@ void LocalPlayer::setImitate(const std::string &player)
{
// TRANSLATORS: imitate command message
std::string msg = strprintf(_("Imitation: %s"), player.c_str());
- debugMsg(msg);
+ debugMsg(msg)
}
else
{
// TRANSLATORS: imitate command message
- debugMsg(_("Imitation canceled"));
+ debugMsg(_("Imitation canceled"))
}
}
@@ -2370,12 +2370,12 @@ void LocalPlayer::cancelFollow()
if (!mPlayerFollowed.empty())
{
// TRANSLATORS: cancel follow message
- debugMsg(_("Follow canceled"));
+ debugMsg(_("Follow canceled"))
}
if (!mPlayerImitated.empty())
{
// TRANSLATORS: cancel follow message
- debugMsg(_("Imitation canceled"));
+ debugMsg(_("Imitation canceled"))
}
mPlayerFollowed.clear();
mPlayerImitated.clear();
@@ -2733,7 +2733,7 @@ void LocalPlayer::checkNewName(Being *const being)
if (!mWaitFor.empty() && mWaitFor == nick)
{
// TRANSLATORS: wait player/monster message
- debugMsg(strprintf(_("You see %s"), mWaitFor.c_str()));
+ debugMsg(strprintf(_("You see %s"), mWaitFor.c_str()))
soundManager.playGuiSound(SOUND_INFO);
mWaitFor.clear();
}
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index 32a39e0c7..cb8fc195a 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -436,7 +436,7 @@ void init()
void deinit()
{
clearInventory();
- delete2(mMercenary);
+ delete2(mMercenary)
mPetBeingId = BeingId_zero;
}
@@ -460,9 +460,9 @@ bool isTalking()
void gameDestroyed()
{
- delete2(mInventory);
- delete2(mEquipment);
- delete2(mCartInventory);
+ delete2(mInventory)
+ delete2(mEquipment)
+ delete2(mCartInventory)
}
void stateChange(const StateT state)