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

6
src/map/unit.cpp
View File

@@ -65,7 +65,7 @@ struct unit_data* unit_bl2ud(struct block_list *bl)
case BL_PET: return &((struct pet_data*)bl)->ud;
case BL_NPC: return &((struct npc_data*)bl)->ud;
case BL_HOM: return &((struct homun_data*)bl)->ud;
case BL_MER: return &((struct mercenary_data*)bl)->ud;
case BL_MER: return &((s_mercenary_data*)bl)->ud;
case BL_ELEM: return &((s_elemental_data*)bl)->ud;
default : return NULL;
}
@@ -3216,7 +3216,7 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file,
break;
}
case BL_MER: {
struct mercenary_data *md = (struct mercenary_data *)bl;
s_mercenary_data *md = (s_mercenary_data *)bl;
ud->canact_tick = ud->canmove_tick;
@@ -3557,7 +3557,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
break;
}
case BL_MER: {
struct mercenary_data *md = (TBL_MER*)bl;
s_mercenary_data *md = (TBL_MER*)bl;
struct map_session_data *sd = md->master;
if( mercenary_get_lifetime(md) > 0 )