This diff is not working on last commit rathena

[Helheim90X]

This diff is not working on last commit rathena, conflicts in battle.ccp

battle.cpp: In function 'int battle_skill_damage_skill(block_list*, block_list*, uint16)':
battle.cpp:2185:30: error: 'struct s_skill_db' has no member named 'damage'; did you mean 'name'?
if (!idx || !skill_db[idx]->damage.map)
^~~~~~
name
battle.cpp:2188:27: error: 'struct s_skill_db' has no member named 'damage'; did you mean 'name'?
damage = &skill_db[idx]->damage;

[xEasycore]

There's no modifications in battle.cpp besides to battle_config related, check If you merged some else in your emulator.