summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actor.cpp6
-rw-r--r--src/being/actor.h6
-rw-r--r--src/being/actorsprite.cpp50
-rw-r--r--src/being/actorsprite.h6
-rw-r--r--src/being/being.cpp9
-rw-r--r--src/being/being.h8
-rw-r--r--src/being/beingcacheentry.h6
-rw-r--r--src/being/beingflag.h6
-rw-r--r--src/being/beingspeech.h6
-rw-r--r--src/being/castingeffect.cpp6
-rw-r--r--src/being/castingeffect.h6
-rw-r--r--src/being/compounditem.h6
-rw-r--r--src/being/compoundsprite.cpp7
-rw-r--r--src/being/compoundsprite.h6
-rw-r--r--src/being/crazymoves.cpp6
-rw-r--r--src/being/crazymoves.h6
-rw-r--r--src/being/flooritem.cpp8
-rw-r--r--src/being/flooritem.h6
-rw-r--r--src/being/homunculusinfo.h6
-rw-r--r--src/being/localclan.cpp6
-rw-r--r--src/being/localclan.h6
-rw-r--r--src/being/localplayer.cpp38
-rw-r--r--src/being/localplayer.h6
-rw-r--r--src/being/mercenaryinfo.h6
-rw-r--r--src/being/petinfo.h6
-rw-r--r--src/being/playerignorestrategy.h6
-rw-r--r--src/being/playerinfo.cpp6
-rw-r--r--src/being/playerinfo.h6
-rw-r--r--src/being/playerrelation.cpp6
-rw-r--r--src/being/playerrelation.h6
-rw-r--r--src/being/playerrelations.cpp6
-rw-r--r--src/being/playerrelations.h6
32 files changed, 137 insertions, 139 deletions
diff --git a/src/being/actor.cpp b/src/being/actor.cpp
index 9b850d100..32dd516fa 100644
--- a/src/being/actor.cpp
+++ b/src/being/actor.cpp
@@ -1,10 +1,10 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/actor.h b/src/being/actor.h
index 11e15c969..c76411634 100644
--- a/src/being/actor.h
+++ b/src/being/actor.h
@@ -1,10 +1,10 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 3beb5b9d2..6c79488a1 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -1,10 +1,10 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -46,6 +46,7 @@
#include "utils/checkutils.h"
#include "utils/delete2.h"
#include "utils/foreach.h"
+#include "utils/performance.h"
#include "utils/timer.h"
#include "debug.h"
@@ -124,9 +125,7 @@ void ActorSprite::logic()
if (effect != nullptr &&
effect->mIsPersistent)
{
- updateStatusEffect(*it,
- Enable_true,
- IsStart_false);
+ updateStatusEffect(*it, Enable_true, IsStart_false);
}
}
}
@@ -228,9 +227,7 @@ static void applyEffectByOption(ActorSprite *const actor,
const Enable enable = (opt & option) != 0 ? Enable_true : Enable_false;
option |= opt;
option ^= opt;
- actor->setStatusEffect(id,
- enable,
- IsStart_false);
+ actor->setStatusEffect(id, enable, IsStart_false);
}
if (option != 0U &&
config.getBoolValue("unimplimentedLog"))
@@ -240,8 +237,8 @@ static void applyEffectByOption(ActorSprite *const actor,
"Left value: %u",
name,
option);
- logger->log(str);
- DebugMessageListener::distributeEvent(str);
+ logger->log(str);
+ DebugMessageListener::distributeEvent(str);
}
}
@@ -256,16 +253,12 @@ static void applyEffectByOption1(ActorSprite *const actor,
const int32_t id = (*it).second;
if (opt == option)
{
- actor->setStatusEffect(id,
- Enable_true,
- IsStart_false);
+ actor->setStatusEffect(id, Enable_true, IsStart_false);
option = 0U;
}
else
{
- actor->setStatusEffect(id,
- Enable_false,
- IsStart_false);
+ actor->setStatusEffect(id, Enable_false, IsStart_false);
}
}
if (option != 0 &&
@@ -276,8 +269,8 @@ static void applyEffectByOption1(ActorSprite *const actor,
"Left value: %u",
name,
option);
- logger->log(str);
- DebugMessageListener::distributeEvent(str);
+ logger->log(str);
+ DebugMessageListener::distributeEvent(str);
}
}
@@ -318,8 +311,9 @@ void ActorSprite::updateStatusEffect(const int32_t index,
const Enable newStatus,
const IsStart start)
{
- StatusEffect *const effect = StatusEffectDB::getStatusEffect(
- index, newStatus);
+ StatusEffect *const effect
+ = StatusEffectDB::getStatusEffect(index, newStatus);
+
if (effect == nullptr)
return;
if (effect->mIsPoison && getType() == ActorType::Player)
@@ -385,9 +379,10 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
{
if (display.image.empty())
{
- addSprite(AnimatedSprite::delayedLoad(pathJoin(
- paths.getStringValue("sprites"),
- paths.getStringValue("spriteErrorFile")),
+ addSprite(AnimatedSprite::delayedLoad(
+ pathJoin(
+ paths.getStringValue("sprites"),
+ paths.getStringValue("spriteErrorFile")),
0));
}
else
@@ -524,10 +519,9 @@ std::string ActorSprite::getStatusEffectsString() const
{
FOR_EACH (std::set<int32_t>::const_iterator, it, mStatusEffects)
{
- const StatusEffect *const effect =
- StatusEffectDB::getStatusEffect(
- *it,
- Enable_true);
+ const StatusEffect *const effect
+ = StatusEffectDB::getStatusEffect(*it, Enable_true);
+
if (effect == nullptr)
continue;
if (!effectsStr.empty())
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index 2ce25fb22..97be88653 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -1,10 +1,10 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 75c9651d5..980bec103 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -117,6 +117,7 @@
#include "utils/foreach.h"
#include "utils/gettext.h"
#include "utils/likely.h"
+#include "utils/performance.h"
#include "utils/stdmove.h"
#include "utils/timer.h"
@@ -4343,7 +4344,7 @@ void Being::drawHpBar(Graphics *restrict const graphics,
#ifdef TMWA_SUPPORT
// TODO: this is support for pre-2015 TMWAthena, remove in 2025?
- // See mana/plus!68.
+ // See mana/verse!68.
if (!serverFeatures->haveServerHp())
{ // old servers
if ((damage == 0 && (this != localPlayer || hp == maxHP))
diff --git a/src/being/being.h b/src/being/being.h
index 678ea0c2a..320faa5e2 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -192,7 +192,7 @@ class Being notfinal : public ActorSprite,
* Puts a damage bubble above this being.
*
* @param attacker the attacking being
- * @param amount the amount of damage recieved (0 means miss)
+ * @param amount the amount of damage received (0 means miss)
* @param type the attack type
* @param attackId the attack id
* @param level the skill level
diff --git a/src/being/beingcacheentry.h b/src/being/beingcacheentry.h
index 5a584deea..4b251aa94 100644
--- a/src/being/beingcacheentry.h
+++ b/src/being/beingcacheentry.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/beingflag.h b/src/being/beingflag.h
index f662ef6ab..7e93ea196 100644
--- a/src/being/beingflag.h
+++ b/src/being/beingflag.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/beingspeech.h b/src/being/beingspeech.h
index 8d72f6f6d..e06927362 100644
--- a/src/being/beingspeech.h
+++ b/src/being/beingspeech.h
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/castingeffect.cpp b/src/being/castingeffect.cpp
index 88af882dd..9ceaf5b41 100644
--- a/src/being/castingeffect.cpp
+++ b/src/being/castingeffect.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/castingeffect.h b/src/being/castingeffect.h
index a417e1069..1519d1a59 100644
--- a/src/being/castingeffect.h
+++ b/src/being/castingeffect.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/compounditem.h b/src/being/compounditem.h
index 82be9a499..3880242df 100644
--- a/src/being/compounditem.h
+++ b/src/being/compounditem.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index da8d497a3..054da503c 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -1,10 +1,10 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@
#include "utils/dtor.h"
#include "utils/foreach.h"
#include "utils/likely.h"
+#include "utils/performance.h"
#include "utils/sdlcheckutils.h"
#ifndef USE_SDL2
diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h
index eee99a6a4..bb14815ee 100644
--- a/src/being/compoundsprite.h
+++ b/src/being/compoundsprite.h
@@ -1,10 +1,10 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/crazymoves.cpp b/src/being/crazymoves.cpp
index d757b1f8c..3d161cba8 100644
--- a/src/being/crazymoves.cpp
+++ b/src/being/crazymoves.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/crazymoves.h b/src/being/crazymoves.h
index e7a3ec37e..8ccdaf30e 100644
--- a/src/being/crazymoves.h
+++ b/src/being/crazymoves.h
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/flooritem.cpp b/src/being/flooritem.cpp
index c618660f1..fbfcf2e83 100644
--- a/src/being/flooritem.cpp
+++ b/src/being/flooritem.cpp
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,6 +43,8 @@
#endif // TMWA_SUPPORT
#include "net/serverfeatures.h"
+#include "utils/performance.h"
+
#include "debug.h"
extern volatile time_t cur_time;
diff --git a/src/being/flooritem.h b/src/being/flooritem.h
index b63a02103..ac17fad71 100644
--- a/src/being/flooritem.h
+++ b/src/being/flooritem.h
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/homunculusinfo.h b/src/being/homunculusinfo.h
index 8f23ec430..f6b1c7456 100644
--- a/src/being/homunculusinfo.h
+++ b/src/being/homunculusinfo.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/localclan.cpp b/src/being/localclan.cpp
index b8744e6ec..12a0b01ea 100644
--- a/src/being/localclan.cpp
+++ b/src/being/localclan.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2018-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/localclan.h b/src/being/localclan.h
index 9ad3628d4..36c0dae07 100644
--- a/src/being/localclan.h
+++ b/src/being/localclan.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2018-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 1e2f16bea..218a77ce2 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -91,6 +91,7 @@
#include "utils/delete2.h"
#include "utils/foreach.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/timer.h"
#ifdef USE_MUMBLE
@@ -299,10 +300,10 @@ void LocalPlayer::logic()
{
if (mMessageTime == 0)
{
- const MessagePair info = mMessages.front();
-
if ((particleEngine != nullptr) && (gui != nullptr))
{
+ const MessagePair& info = mMessages.front();
+
particleEngine->addTextRiseFadeOutEffect(
info.first,
mPixelX,
@@ -328,14 +329,15 @@ void LocalPlayer::logic()
else
{
// Find whether target is in range
- const int rangeX = CAST_S32(
- abs(mTarget->mX - mX));
- const int rangeY = CAST_S32(
- abs(mTarget->mY - mY));
+ const int dx = abs(mTarget->mX - mX);
+ const int dy = abs(mTarget->mY - mY);
const int attackRange = getAttackRange();
- const TargetCursorTypeT targetType
- = rangeX > attackRange || rangeY > attackRange
- ? TargetCursorType::NORMAL : TargetCursorType::IN_RANGE;
+ const bool inRange = (dx <= attackRange
+ && dy <= attackRange);
+ const TargetCursorTypeT targetType =
+ inRange ? TargetCursorType::IN_RANGE
+ : TargetCursorType::NORMAL;
+
mTarget->setTargetType(targetType);
if (!mTarget->isAlive() && (!mTargetDeadPlayers
@@ -515,13 +517,11 @@ bool LocalPlayer::pickUp(FloorItem *const item)
const int dx = item->getTileX() - mX;
const int dy = item->getTileY() - mY;
- int dist = 6;
+ const int maxTileDist = 1*1 + 1*1; // item in 3x3 area around player
const unsigned int pickUpType = settings.pickUpType;
- if (pickUpType >= 4 && pickUpType <= 6)
- dist = 4;
- if (dx * dx + dy * dy < dist)
+ if (dx*dx + dy*dy <= maxTileDist)
{
if ((actorManager != nullptr) && actorManager->checkForPickup(item))
{
@@ -829,8 +829,8 @@ void LocalPlayer::attack(Being *const target,
return;
}
-#ifdef TMWA_SUPPORT
- if (Net::getNetworkType() == ServerType::TMWATHENA)
+ if ((mServerAttack == Keep_false) ||
+ (Net::getNetworkType() == ServerType::TMWATHENA))
{
const int dist_x = target->mX - mX;
const int dist_y = target->mY - mY;
@@ -850,7 +850,6 @@ void LocalPlayer::attack(Being *const target,
setDirection(BeingDirection::LEFT);
}
}
-#endif // TMWA_SUPPORT
mActionTime = tick_time;
@@ -1369,6 +1368,7 @@ void LocalPlayer::moveToTarget(int dist)
ServerType::TMWATHENA);
switch (dist)
{
+ case 10: // range
case 11: // archer
dist = mAttackRange;
if (dist == 1 && broken)
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index a972e9d6e..2a63e9080 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/mercenaryinfo.h b/src/being/mercenaryinfo.h
index 7671fadf3..0c766e80a 100644
--- a/src/being/mercenaryinfo.h
+++ b/src/being/mercenaryinfo.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/petinfo.h b/src/being/petinfo.h
index 6109776ba..91864ed9d 100644
--- a/src/being/petinfo.h
+++ b/src/being/petinfo.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/playerignorestrategy.h b/src/being/playerignorestrategy.h
index 9bd732f29..1ce3a38fa 100644
--- a/src/being/playerignorestrategy.h
+++ b/src/being/playerignorestrategy.h
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index d99e6bd56..25605ff2b 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -1,10 +1,10 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index ff1da6495..995fdd1bf 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -1,10 +1,10 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/playerrelation.cpp b/src/being/playerrelation.cpp
index b2cef86ee..863399124 100644
--- a/src/being/playerrelation.cpp
+++ b/src/being/playerrelation.cpp
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/playerrelation.h b/src/being/playerrelation.h
index 4c9b5d31d..b69858028 100644
--- a/src/being/playerrelation.h
+++ b/src/being/playerrelation.h
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index 4fc4020d1..b61b66852 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h
index 773f21bb3..7b06c569d 100644
--- a/src/being/playerrelations.h
+++ b/src/being/playerrelations.h
@@ -1,11 +1,11 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2011-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by