summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt6
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/clif.c3
3 files changed, 10 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e44dac3c3..5e8e1a59c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,12 @@ 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/08/04
+ * Added a commented piece of code at the end of clif_parse_LoadEndAck which
+ will update your direction to wherever you were facing before warping.
+ Should this be the default? Nearby people DO see you facing on the same
+ direction before warping, it's only your client that will always see you
+ facing north on spawn (the spawn packet does contain direction
+ information). [Skotlex]
* Updated @mobinfo to display slots in the drop information. [Skotlex]
* Fixed flag.elefix not being respected in battle_calc_misc_damage.
[Skotlex]
diff --git a/src/map/battle.c b/src/map/battle.c
index e1a9a3ff3..736ec637d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -251,7 +251,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
sc = status_get_sc(bl);
- if(flag&(BF_MAGIC|BF_LONG) == BF_LONG &&
+ if((flag&(BF_MAGIC|BF_LONG)) == BF_LONG &&
map_getcell(bl->m, bl->x, bl->y, CELL_CHKPNEUMA) &&
skill_num != NPC_GUIDEDATTACK)
return 0;
diff --git a/src/map/clif.c b/src/map/clif.c
index de66fbdcf..31be94733 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8368,6 +8368,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
// If player is dead, and is spawned (such as @refresh) send death packet. [Valaris]
if(pc_isdead(sd))
clif_clearchar_area(&sd->bl,1);
+// Uncomment if you want to make player face in the same direction he was facing right before warping. [Skotlex]
+// else
+// clif_changed_dir(&sd->bl, SELF);
}
/*==========================================