diff options
author | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-09 00:26:36 +0000 |
---|---|---|
committer | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-09 00:26:36 +0000 |
commit | bfb15e68b763800587fa57727fc4baaa0e5e2800 (patch) | |
tree | cc8f52cc370b811d5662c6c69fcabb1c94a1207f /src/map/elemental.c | |
parent | 9c8991447ced838c88037dbbf76cf04a970e25dd (diff) | |
download | hercules-bfb15e68b763800587fa57727fc4baaa0e5e2800.tar.gz hercules-bfb15e68b763800587fa57727fc4baaa0e5e2800.tar.bz2 hercules-bfb15e68b763800587fa57727fc4baaa0e5e2800.tar.xz hercules-bfb15e68b763800587fa57727fc4baaa0e5e2800.zip |
- Removed backup.pl (for TXT servers) and vs9-to-vs8.php (outdated versions);
- Merged @killmonster2 with @killmonster tid:73632;
- Fixed bugreport:6764, auction code was misplaced;
- Follow up to r16753 (bugreport:6523), fixed bugreport:6673, using Gravitational Field with Safety Wall would keep the character immobilized. Blame myself, thankyou Lunar for the fix;
- Fixed bugreport:6514, @slaveclone wouldn't be targeted by monster. Thanks to zippy;
- Fixed bugreport:6837, some code was duplicated;
- Fixed bugreport:6768, removed some leftovers from TXT removal;
- Fixed bugreport:6868, Unequipping a weapon with Incantation Samurai card will not kill you if you have less than 999 hp and are on a non-pvp map;
- Fixed wrong bit field on ai field in mob_data structure. Credits to Ind.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16881 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/elemental.c')
-rw-r--r-- | src/map/elemental.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/map/elemental.c b/src/map/elemental.c index 3abab157f..1157e851e 100644 --- a/src/map/elemental.c +++ b/src/map/elemental.c @@ -457,13 +457,6 @@ int elemental_change_mode(struct elemental_data *ed, int mode) { return 1; } -void elemental_damage(struct elemental_data *ed, int hp, int sp) { - if( hp ) - clif_elemental_updatestatus(ed->master, SP_HP); - if( sp ) - clif_elemental_updatestatus(ed->master, SP_SP); -} - void elemental_heal(struct elemental_data *ed, int hp, int sp) { if( hp ) clif_elemental_updatestatus(ed->master, SP_HP); @@ -471,7 +464,7 @@ void elemental_heal(struct elemental_data *ed, int hp, int sp) { clif_elemental_updatestatus(ed->master, SP_SP); } -int elemental_dead(struct elemental_data *ed, struct block_list *src) { +int elemental_dead(struct elemental_data *ed) { elemental_delete(ed, 1); return 0; } @@ -645,7 +638,6 @@ static int elemental_ai_sub_foreachclient(struct map_session_data *sd, va_list a static int elemental_ai_timer(int tid, unsigned int tick, int id, intptr_t data) { map_foreachpc(elemental_ai_sub_foreachclient,tick); - return 0; } |