diff options
author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-18 07:07:25 +0000 |
---|---|---|
committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-18 07:07:25 +0000 |
commit | aa52f1d90449e970bd5972db00ef29f77eaa39d7 (patch) | |
tree | a391d053cd9063a34bb090f6839d2233e01aece5 /src/map/status.c | |
parent | 797d05f77b8ab4cdfd67fda7aa44126fecc0da21 (diff) | |
download | hercules-aa52f1d90449e970bd5972db00ef29f77eaa39d7.tar.gz hercules-aa52f1d90449e970bd5972db00ef29f77eaa39d7.tar.bz2 hercules-aa52f1d90449e970bd5972db00ef29f77eaa39d7.tar.xz hercules-aa52f1d90449e970bd5972db00ef29f77eaa39d7.zip |
* Added bAddRace2
* Added mob_race2_db.txt
* Updated description for backup_txt in char_athena.conf a bit
* Added some suggestions by Poki#3
* Use the event names from script_athena.conf to check whenever a player event trigger is being read/set
* Removed an unused save/bank.txt
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1131 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r-- | src/map/status.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c index 6c2300dca..74a7bd320 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -510,6 +510,8 @@ int status_calc_pc(struct map_session_data* sd,int first) sd->sp_gain_value = 0; sd->ignore_def_mob = sd->ignore_def_mob_ = 0; sd->hp_loss_rate = sd->hp_loss_value = sd->hp_loss_type = 0; + memset(sd->addrace2,0,sizeof(sd->addrace2)); + memset(sd->addrace2_,0,sizeof(sd->addrace2_)); if(!sd->disguiseflag && sd->disguise) { sd->disguise=0; @@ -2812,6 +2814,16 @@ int status_get_mexp(struct block_list *bl) else return 0; } +int status_get_race2(struct block_list *bl) +{ + nullpo_retr(0, bl); + if(bl->type == BL_MOB && (struct mob_data *)bl) + return mob_db[((struct mob_data *)bl)->class_].race2; + else if(bl->type==BL_PET && (struct pet_data *)bl) + return mob_db[((struct pet_data *)bl)->class_].race2; + else + return 0; +} // StatusChangeŚn‚ĚŹŠ“ľ struct status_change *status_get_sc_data(struct block_list *bl) |