Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed pc_cant_newmount since it has been proved newer clients still support them.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15966 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-04-25 11:20:28 +00:00
parent 745677aafd
commit 9d14415b75
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/map/atcommand.c
View File

@ -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.");

2
src/map/pc.c
View File

@ -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) {

17
src/map/pc.h
View File

@ -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)

4
src/map/script.c
View File

@ -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 )