Explorar o código

* Fixed NPC_INVINCIBLE can be dispelled. (bugreport:4046)
* Fixed a compliation warning.


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

Inkfish %!s(int64=15) %!d(string=hai) anos
pai
achega
3fd1d9ca2b
Modificáronse 3 ficheiros con 5 adicións e 2 borrados
  1. 3 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/clif.c
  3. 1 1
      src/map/skill.c

+ 3 - 0
Changelog-Trunk.txt

@@ -3,6 +3,9 @@ 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.
 
+2010/02/19
+	* Fixed NPC_INVINCIBLE can be dispelled. (bugreport:4046) [Inkfish]
+	* Fixed a compliation warning. [Inkfish]
 2010/02/09
 	* Expanded range for cached and stored-in-db guild member exp (devotion) from uint32 to uint64. (bugreport:3983) [Paradox924X]
 	* Capped value when sending to client to INT_MAX to prevent confusion. [Paradox924X]

+ 1 - 1
src/map/clif.c

@@ -6616,7 +6616,7 @@ int clif_guild_memberlist(struct map_session_data *sd)
 		WFIFOW(fd,c*104+16)=m->gender;
 		WFIFOW(fd,c*104+18)=m->class_;
 		WFIFOW(fd,c*104+20)=m->lv;
-		WFIFOL(fd,c*104+22)=cap_value(m->exp,0,INT_MAX);
+		WFIFOL(fd,c*104+22)=(int)cap_value(m->exp,0,INT_MAX);
 		WFIFOL(fd,c*104+26)=m->online;
 		WFIFOL(fd,c*104+30)=m->position;
 		memset(WFIFOP(fd,c*104+34),0,50);	// ƒ�ƒ‚�H

+ 1 - 1
src/map/skill.c

@@ -4727,7 +4727,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				case SC_READYSTORM:  case SC_READYDOWN:   case SC_READYTURN:
 				case SC_READYCOUNTER:case SC_DODGE:       case SC_WARM:
 				case SC_SPEEDUP1:    case SC_AUTOTRADE:   case SC_CRITICALWOUND:
-				case SC_JEXPBOOST:
+				case SC_JEXPBOOST:	 case SC_INVINCIBLE:  case SC_INVINCIBLEOFF:	
 					continue;
 				case SC_ASSUMPTIO:
 					if( bl->type == BL_MOB )