Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted mercenary_db to YAML format (#6101)

Browse Source 
* Converts the Mercenary Tables file into YAML.
* Includes CSV2YAML converter.
* Fixed mercenary name not properly displayed after moving

Co-authored-by: Aleos <aleos89@users.noreply.github.com>
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
This commit is contained in:
Atemo
2021-12-07 00:49:44 +01:00
committed by GitHub
parent 9b05754071
commit 4a778815a3
28 changed files with 3107 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/mob.cpp
View File

@@ -2351,7 +2351,7 @@ void mob_log_damage(struct mob_data *md, struct block_list *src, int damage)
}
case BL_MER:
{
struct mercenary_data *mer = (TBL_MER*)src;
s_mercenary_data *mer = (TBL_MER*)src;
if( mer->master )
char_id = mer->master->status.char_id;
if( damage )