summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-08 14:51:36 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-08 14:51:36 +0000
commit80de35a12f4da3003c7e4c8f63bbc72b075baa0f (patch)
treeb9ead59a8628a08272a5a54ab24b24bbb5192ded
parent7bfcaa365f27cbd8db87215aaaa9dec92b0edfa0 (diff)
downloadhercules-80de35a12f4da3003c7e4c8f63bbc72b075baa0f.tar.gz
hercules-80de35a12f4da3003c7e4c8f63bbc72b075baa0f.tar.bz2
hercules-80de35a12f4da3003c7e4c8f63bbc72b075baa0f.tar.xz
hercules-80de35a12f4da3003c7e4c8f63bbc72b075baa0f.zip
- Made the return code \n for Apple systems (it was \r before), this still needs fixing, since it should be /r only for pre OSX systems.
- status_change_start will no longer abort if the duration is less than 0 if the status is Ankle Snare (since this stat has it's own minimum) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10185 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/common/cbasetypes.h2
-rw-r--r--src/map/status.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 6db351b67..9eef2d6e5 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -276,8 +276,10 @@ typedef char bool;
#if defined(WIN32) || defined(CYGWIN)
#define RETCODE "\r\n" // CR/LF : Windows systems
+/*FIXME: Mac OSX also uses \n, only pre-OSX uses \r
#elif defined(__APPLE__)
#define RETCODE "\r" // CR : Macintosh systems
+*/
#else
#define RETCODE "\n" // LF : Unix systems
#endif
diff --git a/src/map/status.c b/src/map/status.c
index a4fbef589..efba2b497 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4464,7 +4464,6 @@ int status_get_sc_def(struct block_list *bl, int type)
else if (sc->data[SC_SIEGFRIED].timer != -1)
sc_def += 100*sc->data[SC_SIEGFRIED].val3; //Status resistance.
}
-
return sc_def>10000?10000:sc_def;
}
@@ -4519,7 +4518,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
if (def && tick && !(flag&2))
{
tick -= tick*def/10000;
- if (tick <= 0)
+ if (tick <= 0 && type != SC_ANKLE) //Ankle Snare has it's opwn minimum
return 0;
}