summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-29 01:58:43 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-29 01:58:43 +0000
commit0665a62b072746ac024cef92c199d2e3e609c381 (patch)
tree80413e4292795c050f68ee8bff1222a6ca841648
parent0edf9d90cb93a56abb52bdaf84042294ed648b32 (diff)
downloadhercules-0665a62b072746ac024cef92c199d2e3e609c381.tar.gz
hercules-0665a62b072746ac024cef92c199d2e3e609c381.tar.bz2
hercules-0665a62b072746ac024cef92c199d2e3e609c381.tar.xz
hercules-0665a62b072746ac024cef92c199d2e3e609c381.zip
- Relogging in with 0 HP didn't trigger dead event.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6810 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/clif.c3
-rw-r--r--src/map/pc.c5
3 files changed, 10 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9f6e4879b..a46370f1b 100644
--- a/Changelog-Trunk.txt
+++ b/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.
+2006/05/29
+ * [Fixed]:
+ - Relogging in with 0 HP didn't trigger dead event. [Lance]
2006/05/28
* Added functions status_revive, pc_revive and mob_revive to handle revival
(it doesn't handles player respawning, though). Fixed reviving @ commands.
diff --git a/src/map/clif.c b/src/map/clif.c
index 1b4ec6e93..7dda64347 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8383,8 +8383,9 @@ 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 24c607130..8c65aa39b 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -794,6 +794,11 @@ int pc_reg_received(struct map_session_data *sd)
sd->mission_mobid = pc_readglobalreg(sd,"TK_MISSION_ID");
sd->mission_count = pc_readglobalreg(sd,"TK_MISSION_COUNT");
}
+
+ if(sd->status.hp <= 0){
+ sd->status.hp = 0;
+ sd->vd.dead_sit = sd->state.dead_sit = 1;
+ }
//SG map and mob read [Komurka]
for(i=0;i<3;i++) //for now - someone need to make reading from txt/sql