summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-24 12:28:53 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-24 12:28:53 +0000
commit596ff2483da6c7f5d6279d8809708042975d4451 (patch)
tree86f9e9f421eced086581b4bbc9d56d1fc680afca /src
parentb35718cad265492d13e67c600855a8a45d5c1fbb (diff)
downloadhercules-596ff2483da6c7f5d6279d8809708042975d4451.tar.gz
hercules-596ff2483da6c7f5d6279d8809708042975d4451.tar.bz2
hercules-596ff2483da6c7f5d6279d8809708042975d4451.tar.xz
hercules-596ff2483da6c7f5d6279d8809708042975d4451.zip
Fixed bugreport:6302 where WUG Riding state is not save in char log out.
Follow up r16483 where I forgot to include the list of skills that can be used when riding a WUG.XD git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16491 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c3
-rw-r--r--src/map/pc.c4
-rw-r--r--src/map/skill.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index dcb74304c..d9b95264d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9223,6 +9223,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
if (sd->sc.option&OPTION_RIDING)
clif_status_load(&sd->bl, SI_RIDING, 1);
+ if (sd->sc.option&OPTION_WUGRIDER)
+ clif_status_load(&sd->bl, SI_WUGRIDER, 1);
+
if(sd->status.manner < 0)
sc_start(&sd->bl,SC_NOCHAT,100,0,0);
diff --git a/src/map/pc.c b/src/map/pc.c
index 007c4ee67..c51aaec68 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -518,9 +518,9 @@ int pc_makesavestatus(struct map_session_data *sd)
//Only copy the Cart/Peco/Falcon options, the rest are handled via
//status change load/saving. [Skotlex]
#ifdef NEW_CARTS
- sd->status.option = sd->sc.option&(OPTION_FALCON|OPTION_RIDING|OPTION_DRAGON|OPTION_WUG|OPTION_MADOGEAR|OPTION_MOUNTING);
+ sd->status.option = sd->sc.option&(OPTION_FALCON|OPTION_RIDING|OPTION_DRAGON|OPTION_WUG|OPTION_WUGRIDER|OPTION_MADOGEAR|OPTION_MOUNTING);
#else
- sd->status.option = sd->sc.option&(OPTION_CART|OPTION_FALCON|OPTION_RIDING|OPTION_DRAGON|OPTION_WUG|OPTION_MADOGEAR|OPTION_MOUNTING);
+ sd->status.option = sd->sc.option&(OPTION_CART|OPTION_FALCON|OPTION_RIDING|OPTION_DRAGON|OPTION_WUG|OPTION_WUGRIDER|OPTION_MADOGEAR|OPTION_MOUNTING);
#endif
if (sd->sc.data[SC_JAILED])
{ //When Jailed, do not move last point.
diff --git a/src/map/skill.c b/src/map/skill.c
index 4ff1dded8..bbb1dc0a7 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -11890,11 +11890,13 @@ int skill_check_condition_castbegin(struct map_session_data* sd, short skill, sh
case HT_SKIDTRAP: case HT_LANDMINE: case HT_ANKLESNARE: case HT_SHOCKWAVE:
case HT_SANDMAN: case HT_FLASHER: case HT_FREEZINGTRAP: case HT_BLASTMINE:
case HT_CLAYMORETRAP: case HT_SPRINGTRAP: case RA_DETONATOR: case RA_CLUSTERBOMB:
+ case HT_TALKIEBOX: case RA_FIRINGTRAP: case RA_ICEBOUNDTRAP:
case RA_WUGDASH: case RA_WUGRIDER: case RA_WUGSTRIKE:
break;
default: // in official there is no message.
return 0;
}
+
}
if( pc_ismadogear(sd) ) {
switch( skill ) { //None Mado skills are unusable when Mado is equipped. [Jobbie]