Bläddra i källkod

- Added a missing memset on ers_alloc'ing mob loot which was making data from looted items fill in normal drop info.
- Some more work on the display of Brandish Spear...


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

skotlex 19 år sedan
förälder
incheckning
b5203bb220
3 ändrade filer med 6 tillägg och 1 borttagningar
  1. 3 0
      Changelog-Trunk.txt
  2. 1 0
      src/map/mob.c
  3. 2 1
      src/map/skill.c

+ 3 - 0
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/04/02
+	* Added a missing memset on ers_alloc'ing mob loot which was making data
+	  from looted items fill in normal drop info (in other words, you could get
+	  normal loots that were named after players, for example) [Skotlex]
 	* Added preventing sending packet clif_clearchar_id when the character in
 	  question is invisible. [Skotlex]
 	* Added packet 0x7c in clif_spawn which was supposed to be used for

+ 1 - 0
src/map/mob.c

@@ -1532,6 +1532,7 @@ static struct delay_item_drop* mob_setdropitem(int nameid, int qty, int m, int x
 	struct map_session_data* first_sd, struct map_session_data* second_sd, struct map_session_data* third_sd)
 {
 	struct delay_item_drop *drop = ers_alloc(delay_drop_ers, struct delay_item_drop);
+	memset(&drop->item_data, 0, sizeof(struct item));
 	drop->item_data.nameid = nameid;
 	drop->item_data.amount = qty;
 	drop->item_data.identify = !itemdb_isequip3(nameid);

+ 2 - 1
src/map/skill.c

@@ -1908,7 +1908,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds
 			if (ud && ud->skilltarget == bl->id)
 				clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, skillid, (lv!=0)?lv:skilllv, type);
 			else
-				clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, skillid, -1, type);
+				clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, skillid, -1, 5);
+			break;
 		}
 	case PA_GOSPEL: //Should look like Holy Cross [Skotlex]
 		clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, CR_HOLYCROSS, -1, 5);