diff options
| author | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-24 08:50:59 +0000 |
|---|---|---|
| committer | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-24 08:50:59 +0000 |
| commit | 913fd65ef9a5fa55ebbd5ac4502f72895879fc84 (patch) | |
| tree | 0241f5c639284276a216f86a964c8ff64bb0532b /src/map/clif.c | |
| parent | eef34512a2f465f7b2b5453fadfcc0e61c097e01 (diff) | |
| download | hercules-913fd65ef9a5fa55ebbd5ac4502f72895879fc84.tar.gz hercules-913fd65ef9a5fa55ebbd5ac4502f72895879fc84.tar.bz2 hercules-913fd65ef9a5fa55ebbd5ac4502f72895879fc84.tar.xz hercules-913fd65ef9a5fa55ebbd5ac4502f72895879fc84.zip | |
-Fix bugreport:6751 allow noseige to be casted while under status.
-Upd athena-start, save pid to not kill all other process with same name (annoying when multiple server)
-Harmonize setmapflag and @mapflag, flag value is always an int, and could be superior to 1 for some mapflag
-Fix bugreport:6923 for Windows
-Upd @zeny to remove rest of zeny if not enough money as requested
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16959 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 5ed1dc694..5e7c7f9bf 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1478,7 +1478,7 @@ void clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int flag) void clif_send_homdata(struct map_session_data *sd, int state, int param) { //[orn] int fd = sd->fd; - + if ( (state == SP_INTIMATE) && (param >= 910) && (sd->hd->homunculus.class_ == sd->hd->homunculusDB->evo_class) ) merc_hom_calc_skilltree(sd->hd, 0); @@ -10175,9 +10175,6 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd) return; } - if (sd->sc.opt1 > 0 && sd->sc.opt1 != OPT1_STONEWAIT && sd->sc.opt1 != OPT1_BURNING) - return; - //This flag enables you to use items while in an NPC. [Skotlex] if (sd->npc_id) { if (sd->npc_id != sd->npc_item_flag) |