diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 07:07:59 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 07:07:59 +0000 |
| commit | 9df3b0b2c5469afaba385dbfdadc973830c00ce2 (patch) | |
| tree | a5c33b6796196f1c6b35c6340a3f6b9e8699c4ca | |
| parent | 079b0157248c4c67618717288164ace6053c7d69 (diff) | |
| download | hercules-9df3b0b2c5469afaba385dbfdadc973830c00ce2.tar.gz hercules-9df3b0b2c5469afaba385dbfdadc973830c00ce2.tar.bz2 hercules-9df3b0b2c5469afaba385dbfdadc973830c00ce2.tar.xz hercules-9df3b0b2c5469afaba385dbfdadc973830c00ce2.zip | |
[Fixed]
- Typo in mob_dead causing crash. Thanks to reddozen and his gang for testing.
- Compilation warnings
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6835 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | src/map/mob.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 10 |
3 files changed, 10 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 3b58b230b..1d2ce15b2 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/29
+ * [Fixed]:
+ - Typo in mob_dead causing crash. Thanks to reddozen and his gang for testing.
+ [Lance]
* Cleaned up friend list saving and fixed loading of friends.txt file
(char-txt) [Skotlex]
* Added the Arunafeltz maps, not tested yet [Playtester]
@@ -14,7 +17,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. * Fixed battle_check_target check on BCT_ALL to check versus BL_CHAR
instead of BL_PC and BL_MOB [Skotlex]
* [Fixed]:
- - Declaration of int map_getcellp(struct map_data*,int,int,cell_t);
+ - Declaration of int map_getcellp(struct map_data*,int,int,cell_t); [Lance]
* Removed Undead being inmune to poison status. [Skotlex]
* Removed speed penalty from SC_SKA [Skotlex]
* Fixed SC_SPURT triggering on Soul Linkers. [Skotlex]
diff --git a/src/map/mob.c b/src/map/mob.c index 9b18dcd15..8fb6e70f7 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1744,7 +1744,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) tmpsd[temp] = map_charid2sd(md->dmglog[i].id); if(tmpsd[temp] == NULL) continue; - if(tmpsd[temp]->bl.m != md->bl.m || pc_isdead(tmpsd[i])) + if(tmpsd[temp]->bl.m != md->bl.m || pc_isdead(tmpsd[temp])) continue; temp++; diff --git a/src/map/status.c b/src/map/status.c index 952045c33..eaa6b8c72 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -549,18 +549,18 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s } status_change_end(target, SC_DEVOTION, -1); } - if(sc->data[SC_DANCING].timer != -1 && hp > status->max_hp>>2) + if(sc->data[SC_DANCING].timer != -1 && hp > (signed int)status->max_hp>>2) skill_stop_dancing(target); } unit_skillcastcancel(target, 2); } - if (hp >= status->hp) { + if (hp >= (signed int)status->hp) { if (flag&2) return 0; hp = status->hp; } - if (sp > status->sp) { + if (sp > (signed int)status->sp) { if (flag&2) return 0; sp = status->sp; } @@ -621,7 +621,7 @@ int status_heal(struct block_list *bl,int hp,int sp, int flag) hp = 0; - if(hp > status->max_hp - status->hp) + if(hp > (signed int)(status->max_hp - status->hp)) hp = status->max_hp - status->hp; } @@ -631,7 +631,7 @@ int status_heal(struct block_list *bl,int hp,int sp, int flag) } if(sp) { - if(sp > status->max_sp - status->sp) + if(sp > (signed int)(status->max_sp - status->sp)) sp = status->max_sp - status->sp; } |