Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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.

Browse Source 
- 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://svn.code.sf.net/p/rathena/svn/trunk@10185 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-04-08 14:51:36 +00:00
parent f6cc6e26d3
commit 7f98907fa9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cbasetypes.h
View File

@ -276,8 +276,10 @@ typedef char bool;
#if defined(WIN32) || defined(CYGWIN) #if defined(WIN32) || defined(CYGWIN)
#define RETCODE "\r\n" // CR/LF : Windows systems #define RETCODE "\r\n" // CR/LF : Windows systems
/*FIXME: Mac OSX also uses \n, only pre-OSX uses \r
#elif defined(__APPLE__) #elif defined(__APPLE__)
#define RETCODE "\r" // CR : Macintosh systems #define RETCODE "\r" // CR : Macintosh systems
*/
#else #else
#define RETCODE "\n" // LF : Unix systems #define RETCODE "\n" // LF : Unix systems
#endif #endif

3
src/map/status.c
View File

@ -4464,7 +4464,6 @@ int status_get_sc_def(struct block_list *bl, int type)
else if (sc->data[SC_SIEGFRIED].timer != -1) else if (sc->data[SC_SIEGFRIED].timer != -1)
sc_def += 100*sc->data[SC_SIEGFRIED].val3; //Status resistance. sc_def += 100*sc->data[SC_SIEGFRIED].val3; //Status resistance.
} }
return sc_def>10000?10000:sc_def; 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)) if (def && tick && !(flag&2))
{ {
tick -= tick*def/10000; tick -= tick*def/10000;
if (tick <= 0) if (tick <= 0 && type != SC_ANKLE) //Ankle Snare has it's opwn minimum
return 0; return 0;
} }