diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-26 14:30:34 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-26 14:30:34 +0000 |
| commit | 44cad82e776e7455eaaee4bdf00d03cfe2d8efc0 (patch) | |
| tree | a890785c685d04f8e7f2052c1865e504d21fb152 | |
| parent | faf5db4456e654b8837e80e124b7a90a03a3923c (diff) | |
| download | hercules-44cad82e776e7455eaaee4bdf00d03cfe2d8efc0.tar.gz hercules-44cad82e776e7455eaaee4bdf00d03cfe2d8efc0.tar.bz2 hercules-44cad82e776e7455eaaee4bdf00d03cfe2d8efc0.tar.xz hercules-44cad82e776e7455eaaee4bdf00d03cfe2d8efc0.zip | |
- Enabled changing of equipment while stunned/asleep/petrified/etc
- Cleaned up a bit the skill_castend_id dead checks.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7890 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 6 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b71594d6c..8d8c61eb6 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/07/26
+ * Enabled changing of equipment while stunned/asleep/petrified/etc [Skotlex]
2006/07/25
* Cleaned up run_script_main to properly free previous stack-data when
running scripts. Note that scripts may still leak memory when run by
diff --git a/src/map/clif.c b/src/map/clif.c index 37b80ce33..f7a54b28e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9271,11 +9271,11 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd) if(sd->npc_id) {
if (sd->npc_id != sd->npc_item_flag)
return;
- } else if (sd->state.storage_flag)
- ; //You can equip/unequip stuff while storage is open.
+ } else if (sd->state.storage_flag || sd->sc.opt1)
+ ; //You can equip/unequip stuff while storage is open/under status changes
else if (clif_cant_act(sd))
return;
-
+
if(sd->sc.data[SC_BLADESTOP].timer!=-1 || sd->sc.data[SC_BERSERK].timer!=-1 )
return;
diff --git a/src/map/skill.c b/src/map/skill.c index 364d87b1b..1ccb4be2b 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3300,9 +3300,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if(bl->prev == NULL) return 1; - if(status_isdead(src) && skillid != NPC_REBIRTH) + if(status_isdead(src)) return 1; - if(status_isdead(bl) && skillid != NPC_REBIRTH && skillid != ALL_RESURRECTION && skillid != PR_REDEMPTIO) + if(src!=bl && status_isdead(bl) && skillid != ALL_RESURRECTION && skillid != PR_REDEMPTIO) return 1; tstatus = status_get_status_data(bl); |