summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-25 11:20:28 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-25 11:20:28 +0000
commitf648a45e89b40f972f1016da1cc87ff780faaba9 (patch)
treee4f8867db08e45396087784144e2150e30185d6b
parenta8c81ca65f67b8864845178a11aea1012b2229e7 (diff)
downloadhercules-f648a45e89b40f972f1016da1cc87ff780faaba9.tar.gz
hercules-f648a45e89b40f972f1016da1cc87ff780faaba9.tar.bz2
hercules-f648a45e89b40f972f1016da1cc87ff780faaba9.tar.xz
hercules-f648a45e89b40f972f1016da1cc87ff780faaba9.zip
Removed pc_cant_newmount since it has been proved newer clients still support them.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15966 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/atcommand.c5
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/pc.h17
-rw-r--r--src/map/script.c4
4 files changed, 2 insertions, 26 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index bfe510e34..d5a8e75e0 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8441,11 +8441,6 @@ ACMD_FUNC(charcommands)
ACMD_FUNC(new_mount) {
- if( pc_cant_newmount(sd) && !(sd->sc.option&OPTION_MOUNTING) ) {
- clif_displaymessage(sd->fd,"Your character cannot mount a new mount");
- return -1;
- }
-
clif_displaymessage(sd->fd,"NOTICE: If you crash with mount your LUA is outdated");
if( !(sd->sc.option&OPTION_MOUNTING) ) {
clif_displaymessage(sd->fd,"You have mounted.");
diff --git a/src/map/pc.c b/src/map/pc.c
index e2bf1b725..345ca1c83 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7081,7 +7081,7 @@ int pc_setoption(struct map_session_data *sd,int type)
status_calc_pc(sd,0); //Remove speed penalty.
}
- if (type&OPTION_MOUNTING && !(p_type&OPTION_MOUNTING) && !pc_cant_newmount(sd) ) {
+ if (type&OPTION_MOUNTING && !(p_type&OPTION_MOUNTING) ) {
clif_status_load_notick(&sd->bl,SI_ALL_RIDING,2,1,0,0);
status_calc_pc(sd,0);
} else if (!(type&OPTION_MOUNTING) && p_type&OPTION_MOUNTING) {
diff --git a/src/map/pc.h b/src/map/pc.h
index 39ac3100a..b1677a3a6 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -624,23 +624,6 @@ enum e_pc_permission {
#define pc_iswug(sd) ( (sd)->sc.option&OPTION_WUG )
#define pc_isridingwug(sd) ( (sd)->sc.option&OPTION_WUGRIDER )
-/**
- * New Mounts -- can this damn job not
- **/
-#define pc_cant_newmount(sd) \
- ( \
- ( (sd)->class_&MAPID_THIRDMASK) == MAPID_RANGER || \
- ( ((sd)->class_&MAPID_BASEMASK) == MAPID_SWORDMAN && (sd)->status.class_ != JOB_SWORDMAN ) \
- )
-
-/**
- * New Mounts are available to all jobs prior to November 2011
- **/
-#if PACKETVER <= 20111100
- #undef pc_cant_newmount
- #define pc_cant_newmount(sd) 0
-#endif
-
#define pc_stop_walking(sd, type) unit_stop_walking(&(sd)->bl, type)
#define pc_stop_attack(sd) unit_stop_attack(&(sd)->bl)
diff --git a/src/map/script.c b/src/map/script.c
index fac58418d..14ee625f7 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7484,8 +7484,6 @@ BUILDIN_FUNC(setoption)
if( flag ){// Add option
if( option&OPTION_WEDDING && !battle_config.wedding_modifydisplay )
option &= ~OPTION_WEDDING;// Do not show the wedding sprites
- else if ( option&OPTION_MOUNTING && pc_cant_newmount(sd) )
- option &= ~OPTION_MOUNTING;
pc_setoption(sd, sd->sc.option|option);
} else// Remove option
pc_setoption(sd, sd->sc.option&~option);
@@ -15810,7 +15808,7 @@ BUILDIN_FUNC(setmounting) {
TBL_PC* sd;
if( (sd = script_rid2sd(st)) == NULL )
return 0;
- if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) || pc_cant_newmount(sd) )
+ if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) )
script_pushint(st,0);//can't mount with one of these
else {
if( sd->sc.option&OPTION_MOUNTING )