Переглянути джерело

- Enabled changing of equipment while stunned/asleep/petrified/etc
- Cleaned up a bit the skill_castend_id dead checks.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7890 54d463be-8e91-2dee-dedb-b68131a5f0ec

skotlex 19 роки тому
батько
коміт
9572db00eb
3 змінених файлів з 7 додано та 5 видалено
  1. 2 0
      Changelog-Trunk.txt
  2. 3 3
      src/map/clif.c
  3. 2 2
      src/map/skill.c

+ 2 - 0
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

+ 3 - 3
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;
 

+ 2 - 2
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);