diff options
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 8 | ||||
| -rw-r--r-- | src/map/pc.h | 6 | ||||
| -rw-r--r-- | src/map/status.h | 2 |
6 files changed, 14 insertions, 11 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b75908e3e..1e1fe2644 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,11 @@ 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/12/12 + * Removed CART_MASK as OPTION_CART can take care of that. + * Moved the OPTION_MASK define to status.h + * Reverted the knockback implementation to use clif_slide instead of + clif_fixpos [Skotlex] 2006/12/11 * Added various missing checks when parsing several guild actions. * made @hominfo display the six basic stats. diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 2ee456a58..823dde505 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2280,7 +2280,7 @@ int atcommand_option( sd->sc.opt1 = param1; sd->sc.opt2 = param2; - if (!(sd->sc.option & CART_MASK) && param3 & CART_MASK) { + if (!(sd->sc.option & OPTION_CART) && param3 & OPTION_CART) { clif_cartlist(sd); clif_updatestatus(sd, SP_CARTINFO); } diff --git a/src/map/battle.c b/src/map/battle.c index db526dda8..b1e194247 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3882,7 +3882,7 @@ void battle_set_defaults() { battle_config.enable_critical=BL_PC; battle_config.mob_critical_rate=100; battle_config.critical_rate=100; - battle_config.enable_baseatk = BL_PC; + battle_config.enable_baseatk = BL_PC|BL_HOM; battle_config.enable_perfect_flee = BL_PC|BL_PET; battle_config.cast_rate=100; battle_config.delay_rate=100; diff --git a/src/map/clif.c b/src/map/clif.c index 9b8bcfdeb..bc4ade158 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1864,11 +1864,9 @@ int clif_changemapserver(struct map_session_data *sd, char *mapname, int x, int } int clif_blown(struct block_list *bl) { -//Previous Aegis versions simply used clif_fixpos, but it seems clif_slide works better on current clients. -// However, because of client desyncs, and because current Aegis captures show that they still use fixpos, keep using that for now. - return clif_fixpos(bl); -// return clif_slide(bl, bl->x, bl->y); - +//Aegis packets says fixpos, but it's unsure whether slide works better or not. +// return clif_fixpos(bl); + return clif_slide(bl, bl->x, bl->y); } /*========================================== * diff --git a/src/map/pc.h b/src/map/pc.h index 9d9809263..0eb406c7d 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -6,9 +6,7 @@ #include "map.h" #include "unit.h" - -#define OPTION_MASK 0xd7b8 -#define CART_MASK 0x788 +#include "status.h" //Update this max as necessary. 53 is the value needed for Super Baby currently #define MAX_SKILL_TREE 53 @@ -96,7 +94,7 @@ enum { #define pc_ishiding(sd) ((sd)->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK)) #define pc_iscloaking(sd) (!((sd)->sc.option&OPTION_CHASEWALK) && ((sd)->sc.option&OPTION_CLOAK)) #define pc_ischasewalk(sd) ((sd)->sc.option&OPTION_CHASEWALK) -#define pc_iscarton(sd) ((sd)->sc.option&CART_MASK) +#define pc_iscarton(sd) ((sd)->sc.option&OPTION_CART) #define pc_isfalcon(sd) ((sd)->sc.option&OPTION_FALCON) #define pc_isriding(sd) ((sd)->sc.option&OPTION_RIDING) #define pc_isinvisible(sd) ((sd)->sc.option&OPTION_INVISIBLE) diff --git a/src/map/status.h b/src/map/status.h index fd73b98af..8f7a02916 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -470,6 +470,8 @@ enum { #define OPTION_CART (OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5) +#define OPTION_MASK ~0x40 + //Defines for the manner system [Skotlex] #define MANNER_NOCHAT 0x01 #define MANNER_NOSKILL 0x02 |