diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-02 00:54:21 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-02 00:54:21 +0000 |
commit | 5451ba7f9967d74103a05563bc11430e9e647946 (patch) | |
tree | a1c9bf9ee8f8045223a70cfca6cc4726f425205a /src | |
parent | 1efc5809bf874072d0b5f1b2f9f544fad8825852 (diff) | |
download | hercules-5451ba7f9967d74103a05563bc11430e9e647946.tar.gz hercules-5451ba7f9967d74103a05563bc11430e9e647946.tar.bz2 hercules-5451ba7f9967d74103a05563bc11430e9e647946.tar.xz hercules-5451ba7f9967d74103a05563bc11430e9e647946.zip |
- Updated item_db.sql/mob_db.sql to current.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6922 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r-- | src/map/clif.c | 3 | ||||
-rw-r--r-- | src/map/pc.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index fc81925ee..fde947661 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8342,9 +8342,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) else
sd->areanpc_id = 0;
- if (pc_isdead(sd)){ //In case you warped dead.
+ if (pc_isdead(sd)) //In case you warped dead.
clif_clearchar_area(&sd->bl, 1);
- }
}
/*==========================================
diff --git a/src/map/pc.c b/src/map/pc.c index f39b6b33a..9c42dee1c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -796,9 +796,8 @@ int pc_reg_received(struct map_session_data *sd) sd->mission_count = pc_readglobalreg(sd,"TK_MISSION_COUNT");
}
- if(sd->battle_status.hp == 0){
+ if(sd->battle_status.hp == 0)
pc_setrestartvalue(sd, 1);
- }
//SG map and mob read [Komurka]
for(i=0;i<3;i++) //for now - someone need to make reading from txt/sql
|