浏览代码

- 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://svn.code.sf.net/p/rathena/svn/trunk@10185 54d463be-8e91-2dee-dedb-b68131a5f0ec

skotlex 18 年之前
父节点
当前提交
7f98907fa9
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 2 0
      src/common/cbasetypes.h
  2. 1 2
      src/map/status.c

+ 2 - 0
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

+ 1 - 2
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;
 		}