summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-08 03:49:44 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-08 03:49:44 +0000
commitaaca2ea1b3c25e29fed6a51e999b662192d92d36 (patch)
treebc6a47cea6c1df80158e2adab3e0b0aa2a3c3227 /src/map/clif.c
parentfbd1469bd30b81cddafb69e447db73954edf962f (diff)
downloadhercules-aaca2ea1b3c25e29fed6a51e999b662192d92d36.tar.gz
hercules-aaca2ea1b3c25e29fed6a51e999b662192d92d36.tar.bz2
hercules-aaca2ea1b3c25e29fed6a51e999b662192d92d36.tar.xz
hercules-aaca2ea1b3c25e29fed6a51e999b662192d92d36.zip
* Remove some unnecessary checks in battle.c
* Added some checks to prevent novices still allowed to attack when using Trick Dead git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@936 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 0412192e1..825e18e96 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8041,7 +8041,8 @@ void clif_parse_ActionRequest(int fd, struct map_session_data *sd) {
}
if (sd->npc_id != 0 || sd->opt1 > 0 || sd->status.option & 2 ||
(sd->sc_data &&
- (sd->sc_data[SC_AUTOCOUNTER].timer != -1 || //オートカウンター
+ (sd->sc_data[SC_TRICKDEAD].timer != -1 ||
+ sd->sc_data[SC_AUTOCOUNTER].timer != -1 || //オートカウンター
sd->sc_data[SC_BLADESTOP].timer != -1 || //白刃取り
sd->sc_data[SC_DANCING].timer != -1))) //ダンス中
return;