summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-27 14:54:40 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-27 14:54:40 +0000
commit50e31d2860fe8f754d186a35ac1b4b61f653af5a (patch)
tree2ddbbc4bc094e98daca48f38b5130beb320d50cb /src/map/pc.c
parent7e54a062e03f14bb1540f6b4ff249cf888d5ea35 (diff)
downloadhercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.tar.gz
hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.tar.bz2
hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.tar.xz
hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.zip
- Pet catching now uses the menuskill variables to prevent item usage from disrupting the catch process.
- Added Safetywall to the list not blocked by Dispell. - Added some include limits.h required by window compiles. - Corrected Wedding rings being trade-able. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5772 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 95aab502f..f51d86ecc 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1474,7 +1474,8 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
case SP_INFINITE_ENDURE:
if(sd->state.lr_flag != 2) {
sd->special_state.infinite_endure = 1;
- sc_start(&sd->bl, SC_ENDURE,100,1,0);
+ if (sd->sc.data[SC_ENDURE].timer == -1)
+ sc_start(&sd->bl, SC_ENDURE,100,1,0);
}
break;
case SP_INTRAVISION: // Maya Purple Card effect allowing to see Hiding/Cloaking people [DracoRPG]