diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-02 12:18:24 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-02 12:18:24 +0000 |
| commit | e1d0bdd2fcdcdb1452d0bf191b427459951e147f (patch) | |
| tree | bf9e1919794a0505d003d3205e45b493261315f3 | |
| parent | ffc190d0ac0c1b6def3fb947c0fb36004fe6c13d (diff) | |
| download | hercules-e1d0bdd2fcdcdb1452d0bf191b427459951e147f.tar.gz hercules-e1d0bdd2fcdcdb1452d0bf191b427459951e147f.tar.bz2 hercules-e1d0bdd2fcdcdb1452d0bf191b427459951e147f.tar.xz hercules-e1d0bdd2fcdcdb1452d0bf191b427459951e147f.zip | |
Added itemid defines for Stone and Skull_ (used by Pick Stone skill and pvp skull drop, respectively).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13035 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/itemdb.h | 3 | ||||
| -rw-r--r-- | src/map/pc.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 491909114..d0e40ba17 100644 --- a/src/map/clif.c +++ b/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; diff --git a/src/map/itemdb.h b/src/map/itemdb.h index b634ad841..62fc2a83b 100644 --- a/src/map/itemdb.h +++ b/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 diff --git a/src/map/pc.c b/src/map/pc.c index b87f871fa..8eabf3935 100644 --- a/src/map/pc.c +++ b/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; diff --git a/src/map/skill.c b/src/map/skill.c index 8e5b64b64..8385754d1 100644 --- a/src/map/skill.c +++ b/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); |