summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-29 13:11:33 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-29 13:11:33 +0000
commitc78e2df7e04a41e3a69cc49a14022ccf0402f406 (patch)
tree36230ca1271b43269bf12ca1b4a4af9db794c0fa
parenta3002eabaa37d2fc60903d8500ac1ec21c0de8fd (diff)
downloadhercules-c78e2df7e04a41e3a69cc49a14022ccf0402f406.tar.gz
hercules-c78e2df7e04a41e3a69cc49a14022ccf0402f406.tar.bz2
hercules-c78e2df7e04a41e3a69cc49a14022ccf0402f406.tar.xz
hercules-c78e2df7e04a41e3a69cc49a14022ccf0402f406.zip
- Allowed disguising while riding a peco-peco (this does not seem to cause problems anymore)
- Adjusted pc_disguise to work properly if invoked while a player is not in a map. - The pvp rank packet is no longer sent to other players when disguised, as this leads to crashes when you die. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11842 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/clif.c5
-rw-r--r--src/map/pc.c24
3 files changed, 20 insertions, 13 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b035bd67c..00c951714 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/11/29
+ * Allowed disguising while riding a peco-peco (this does not seem to cause
+ problems anymore).
+ * The pvp rank packet is no longer sent to other players when disguised, as
+ this leads to crashes when you die.
* Probably fixed splash damage.
* Reflected spells no longer cause knockback.
* SG Blessing skills now grant the extra experience to everyone when the SG
diff --git a/src/map/clif.c b/src/map/clif.c
index adc45b069..5f59bda74 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4718,9 +4718,8 @@ int clif_set0199(int fd,int type)
*------------------------------------------*/
int clif_pvpset(struct map_session_data *sd,int pvprank,int pvpnum,int type)
{
- int fd = sd->fd;
-
if(type == 2) {
+ int fd = sd->fd;
WFIFOHEAD(fd,packet_len(0x19a));
WFIFOW(fd,0) = 0x19a;
WFIFOL(fd,2) = sd->bl.id;
@@ -4736,7 +4735,7 @@ int clif_pvpset(struct map_session_data *sd,int pvprank,int pvpnum,int type)
else
WBUFL(buf,6) = pvprank;
WBUFL(buf,10) = pvpnum;
- if(sd->sc.option&OPTION_INVISIBLE)
+ if(sd->sc.option&OPTION_INVISIBLE || sd->disguise) //Causes crashes when a 'mob' with pvp info dies.
clif_send(buf,packet_len(0x19a),&sd->bl,SELF);
else if(!type)
clif_send(buf,packet_len(0x19a),&sd->bl,AREA);
diff --git a/src/map/pc.c b/src/map/pc.c
index 1a47458ca..fc39ea88d 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1209,7 +1209,7 @@ int pc_disguise(struct map_session_data *sd, int class_)
{
if (!class_ && !sd->disguise)
return 0;
- if (class_ && (sd->disguise == class_ || pc_isriding(sd)))
+ if (class_ && sd->disguise == class_)
return 0;
if(sd->sc.option&OPTION_INVISIBLE)
@@ -1217,9 +1217,11 @@ int pc_disguise(struct map_session_data *sd, int class_)
sd->disguise = class_; //viewdata is set on uncloaking.
return 2;
}
-
- pc_stop_walking(sd, 0);
- clif_clearunit_area(&sd->bl, 0);
+
+ if (sd->bl.prev != NULL) {
+ pc_stop_walking(sd, 0);
+ clif_clearunit_area(&sd->bl, 0);
+ }
if (!class_) {
sd->disguise = 0;
@@ -1229,13 +1231,15 @@ int pc_disguise(struct map_session_data *sd, int class_)
status_set_viewdata(&sd->bl, class_);
clif_changeoption(&sd->bl);
- clif_spawn(&sd->bl);
- if (class_ == sd->status.class_ && pc_iscarton(sd))
- { //It seems the cart info is lost on undisguise.
- clif_cartlist(sd);
- clif_updatestatus(sd,SP_CARTINFO);
- }
+ if (sd->bl.prev != NULL) {
+ clif_spawn(&sd->bl);
+ if (class_ == sd->status.class_ && pc_iscarton(sd))
+ { //It seems the cart info is lost on undisguise.
+ clif_cartlist(sd);
+ clif_updatestatus(sd,SP_CARTINFO);
+ }
+ }
return 1;
}