Skip to content

refactor: move static Combat methods out of header #5072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ranisalt wants to merge 1 commit into
base: master
Choose a base branch
from
+81 −86
Open

refactor: move static Combat methods out of header #5072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 13 additions & 79 deletions src/combat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,70 +97,22 @@ CombatDamage Combat::getCombatDamage(Creature* creature, Creature* target) const
return damage;
}

CombatType_t Combat::ConditionToDamageType(ConditionType_t type)
static bool isProtected(const Player* attacker, const Player* target)
{
switch (type) {
case CONDITION_FIRE:
return COMBAT_FIREDAMAGE;

case CONDITION_ENERGY:
return COMBAT_ENERGYDAMAGE;

case CONDITION_BLEEDING:
return COMBAT_PHYSICALDAMAGE;

case CONDITION_DROWN:
return COMBAT_DROWNDAMAGE;

case CONDITION_POISON:
return COMBAT_EARTHDAMAGE;

case CONDITION_FREEZING:
return COMBAT_ICEDAMAGE;

case CONDITION_DAZZLED:
return COMBAT_HOLYDAMAGE;

case CONDITION_CURSED:
return COMBAT_DEATHDAMAGE;

default:
break;
uint32_t protectionLevel = getNumber(ConfigManager::PROTECTION_LEVEL);
if (target->getLevel() < protectionLevel || attacker->getLevel() < protectionLevel) {
return true;
}

return COMBAT_NONE;
}

ConditionType_t Combat::DamageToConditionType(CombatType_t type)
{
switch (type) {
case COMBAT_FIREDAMAGE:
return CONDITION_FIRE;

case COMBAT_ENERGYDAMAGE:
return CONDITION_ENERGY;

case COMBAT_DROWNDAMAGE:
return CONDITION_DROWN;

case COMBAT_EARTHDAMAGE:
return CONDITION_POISON;

case COMBAT_ICEDAMAGE:
return CONDITION_FREEZING;

case COMBAT_HOLYDAMAGE:
return CONDITION_DAZZLED;

case COMBAT_DEATHDAMAGE:
return CONDITION_CURSED;

case COMBAT_PHYSICALDAMAGE:
return CONDITION_BLEEDING;
if (!attacker->getVocation()->allowsPvp() || !target->getVocation()->allowsPvp()) {
return true;
}

default:
return CONDITION_NONE;
if (attacker->getSkull() == SKULL_BLACK && attacker->getSkullClient(target) == SKULL_NONE) {
return true;
}

return false;
}

bool Combat::isPlayerCombat(const Creature* target)
Expand Down Expand Up @@ -268,24 +220,6 @@ bool Combat::isInPvpZone(const Creature* attacker, const Creature* target)
return attacker->getZone() == ZONE_PVP && target->getZone() == ZONE_PVP;
}

bool Combat::isProtected(const Player* attacker, const Player* target)
{
uint32_t protectionLevel = getNumber(ConfigManager::PROTECTION_LEVEL);
if (target->getLevel() < protectionLevel || attacker->getLevel() < protectionLevel) {
return true;
}

if (!attacker->getVocation()->allowsPvp() || !target->getVocation()->allowsPvp()) {
return true;
}

if (attacker->getSkull() == SKULL_BLACK && attacker->getSkullClient(target) == SKULL_NONE) {
return true;
}

return false;
}

ReturnValue Combat::canDoCombat(Creature* attacker, Creature* target)
{
if (!attacker) {
Expand Down Expand Up @@ -521,7 +455,7 @@ CallBack* Combat::getCallback(CallBackParam_t key)
return nullptr;
}

void Combat::combatTileEffects(const SpectatorVec& spectators, Creature* caster, Tile* tile, const CombatParams& params)
static void combatTileEffects(const SpectatorVec& spectators, Creature* caster, Tile* tile, const CombatParams& params)
{
if (params.itemId != 0) {
uint16_t itemId = params.itemId;
Expand Down Expand Up @@ -1414,7 +1348,7 @@ void MagicField::onStepInField(Creature* creature)
if (!harmfulField && targetPlayer) {
Player* attackerPlayer = g_game.getPlayerByID(ownerId);
if (attackerPlayer) {
if (Combat::isProtected(attackerPlayer, targetPlayer)) {
if (isProtected(attackerPlayer, targetPlayer)) {
harmfulField = false;
}
}
Expand Down
5 changes: 0 additions & 5 deletions src/combat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,7 @@ class Combat
Combat& operator=(const Combat&) = delete;

static bool isInPvpZone(const Creature* attacker, const Creature* target);
static bool isProtected(const Player* attacker, const Player* target);
static bool isPlayerCombat(const Creature* target);
static CombatType_t ConditionToDamageType(ConditionType_t type);
static ConditionType_t DamageToConditionType(CombatType_t type);
static ReturnValue canTargetCreature(Player* attacker, Creature* target);
static ReturnValue canDoCombat(Creature* caster, Tile* tile, bool aggressive);
static ReturnValue canDoCombat(Creature* attacker, Creature* target);
Expand Down Expand Up @@ -123,8 +120,6 @@ class Combat
void setOrigin(CombatOrigin origin) { params.origin = origin; }

private:
static void combatTileEffects(const SpectatorVec& spectators, Creature* caster, Tile* tile,
const CombatParams& params);
CombatDamage getCombatDamage(Creature* creature, Creature* target) const;

// configurable
Expand Down
36 changes: 35 additions & 1 deletion src/condition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,6 +1368,40 @@ bool ConditionDamage::getNextDamage(int32_t& damage)
return false;
}

constexpr CombatType_t ConditionToDamageType(ConditionType_t type)
Copy link

Copilot AI Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function ConditionToDamageType should be placed in an anonymous namespace or be declared as static to follow the codebase's convention for file-local helper functions. This would prevent potential naming conflicts and clearly indicate that this function has internal linkage.

Copilot uses AI. Check for mistakes.
{
switch (type) {
case CONDITION_FIRE:
return COMBAT_FIREDAMAGE;

case CONDITION_ENERGY:
return COMBAT_ENERGYDAMAGE;

case CONDITION_BLEEDING:
return COMBAT_PHYSICALDAMAGE;

case CONDITION_DROWN:
return COMBAT_DROWNDAMAGE;

case CONDITION_POISON:
return COMBAT_EARTHDAMAGE;

case CONDITION_FREEZING:
return COMBAT_ICEDAMAGE;

case CONDITION_DAZZLED:
return COMBAT_HOLYDAMAGE;

case CONDITION_CURSED:
return COMBAT_DEATHDAMAGE;

default:
break;
}

return COMBAT_NONE;
}

bool ConditionDamage::doDamage(Creature* creature, int32_t healthChange)
{
if (!creature) {
Expand All @@ -1381,7 +1415,7 @@ bool ConditionDamage::doDamage(Creature* creature, int32_t healthChange)
CombatDamage damage;
damage.origin = ORIGIN_CONDITION;
damage.primary.value = healthChange;
damage.primary.type = Combat::ConditionToDamageType(conditionType);
damage.primary.type = ConditionToDamageType(conditionType);

Creature* attacker = g_game.getCreatureByID(owner);
if (field && creature->getPlayer() && attacker && attacker->getPlayer()) {
Expand Down
34 changes: 33 additions & 1 deletion src/map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,38 @@ uint16_t AStarNodes::getMapWalkCost(AStarNode* node, const Position& neighborPos
return MAP_NORMALWALKCOST;
}

constexpr ConditionType_t DamageToConditionType(CombatType_t type)
Copy link

Copilot AI Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function DamageToConditionType should be placed in an anonymous namespace or be declared as static to follow the codebase's convention for file-local helper functions. The codebase uses anonymous namespaces for file-local functions (e.g., see lines 522-558 in map.cpp with checkSteepLine and checkSlightLine functions).

Copilot uses AI. Check for mistakes.
{
switch (type) {
case COMBAT_FIREDAMAGE:
return CONDITION_FIRE;

case COMBAT_ENERGYDAMAGE:
return CONDITION_ENERGY;

case COMBAT_DROWNDAMAGE:
return CONDITION_DROWN;

case COMBAT_EARTHDAMAGE:
return CONDITION_POISON;

case COMBAT_ICEDAMAGE:
return CONDITION_FREEZING;

case COMBAT_HOLYDAMAGE:
return CONDITION_DAZZLED;

case COMBAT_DEATHDAMAGE:
return CONDITION_CURSED;

case COMBAT_PHYSICALDAMAGE:
return CONDITION_BLEEDING;

default:
return CONDITION_NONE;
}
}

uint16_t AStarNodes::getTileWalkCost(const Creature& creature, const Tile* tile)
{
uint16_t cost = 0;
Expand All @@ -925,7 +957,7 @@ uint16_t AStarNodes::getTileWalkCost(const Creature& creature, const Tile* tile)
if (const MagicField* field = tile->getFieldItem()) {
CombatType_t combatType = field->getCombatType();
const Monster* monster = creature.getMonster();
if (!creature.isImmune(combatType) && !creature.hasCondition(Combat::DamageToConditionType(combatType)) &&
if (!creature.isImmune(combatType) && !creature.hasCondition(DamageToConditionType(combatType)) &&
(monster && !monster->canWalkOnFieldType(combatType))) {
cost += MAP_NORMALWALKCOST * 18;
}
Expand Down
Loading