Browse Source

Added itemid defines for Stone and Skull_ (used by Pick Stone skill and pvp skull drop, respectively).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13035 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 17 years ago
parent
commit
eb99fad326
4 changed files with 5 additions and 4 deletions
  1. 1 1
      src/map/clif.c
  2. 2 1
      src/map/itemdb.h
  3. 1 1
      src/map/pc.c
  4. 1 1
      src/map/skill.c

+ 1 - 1
src/map/clif.c

@@ -8126,7 +8126,7 @@ void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd)
 {
 	int id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
 	struct block_list* bl;
-	struct status_change *sc;
+	//struct status_change *sc;
 	
 	if( id < 0 && -id == sd->bl.id ) // for disguises [Valaris]
 		id = sd->bl.id;

+ 2 - 1
src/map/itemdb.h

@@ -14,8 +14,9 @@
 #define ITEMID_RED_GEMSTONE 716
 #define ITEMID_BLUE_GEMSTONE 717
 #define itemid_isgemstone(id) ( (id) >= ITEMID_YELLOW_GEMSTONE && (id) <= ITEMID_BLUE_GEMSTONE )
-
 #define ITEMID_TRAP 1065
+#define ITEMID_STONE 7049
+#define ITEMID_SKULL_ 7420
 
 //The only item group required by the code to be known. See const.txt for the full list.
 #define IG_FINDINGORE 6

+ 1 - 1
src/map/pc.c

@@ -5019,7 +5019,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 	{
 		struct item item_tmp;
 		memset(&item_tmp,0,sizeof(item_tmp));
-		item_tmp.nameid=7420; //PVP Skull item ID
+		item_tmp.nameid=ITEMID_SKULL_;
 		item_tmp.identify=1;
 		item_tmp.card[0]=CARD0_CREATE;
 		item_tmp.card[1]=0;

+ 1 - 1
src/map/skill.c

@@ -4041,7 +4041,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 			clif_skill_nodamage(src,bl,skillid,skilllv,1);
 			memset(&item_tmp,0,sizeof(item_tmp));
 			memset(&tbl,0,sizeof(tbl)); // [MouseJstr]
-			item_tmp.nameid = 7049;
+			item_tmp.nameid = ITEMID_STONE;
 			item_tmp.identify = 1;
 			tbl.id = 0;
 			clif_takeitem(&sd->bl,&tbl);