- Applied FlavioJs's patch which enables colored console output for Windows systems. It also includes a config setting called "stdout_with_ansisequence" with which you can turn off the color codes (in case you are logging all output)

- Added error reporting when the max number of ground unit cells has been reached (this may be the reason why sometimes it fails to recognize when you step out of a song/dance/encore)
- Added passing the Endure effect to other devoted people. Note that the "hit count" is individual for each character, and only when it ends on the Crusader himself will that force it to end on everyone else. It also will not transfer on gvg grounds, but it does transfer in pvp.
- Fixed Reflect-Shield triggering Auto-Guard instead on devoted chars.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9168 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 51 insertions, 43 deletions

diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index c0112685a..f947b34e3 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -5,7 +5,6 @@
 #define _SHOWMSG_H_

 

 #define SHOW_DEBUG_MSG 1

-

 // for help with the console colors look here:

 // http://www.edoceo.com/liberum/?doc=printf-with-color

 // some code explanation (used here):

@@ -14,53 +13,62 @@
 // \033[0m : reset color parameter

 // \033[1m : use bold for font

 

-#ifdef _WIN32

-	#define	CL_RESET	""

-	#define CL_CLS		""

-	#define CL_CLL		""

-	#define	CL_BOLD		""

-	#define CL_NORMAL	CL_RESET

-	#define CL_NONE		CL_RESET

-	#define	CL_WHITE	""

-	#define	CL_GRAY		""

-	#define	CL_RED		""

-	#define	CL_GREEN	""

-	#define	CL_YELLOW	""

-	#define	CL_BLUE		""

-	#define	CL_MAGENTA	""

-	#define	CL_CYAN		""

-	#define	CL_BT_YELLOW	""

-	#define	CL_WTBL			""

-	#define	CL_XXBL			""

-	#define CL_PASS			""

-#else

-	#define	CL_RESET	"\033[0;0m"

-	#define CL_CLS		"\033[2J"

-	#define CL_CLL		"\033[K"

+#define CL_RESET	"\033[0m"

+#define CL_CLS		"\033[2J"

+#define CL_CLL		"\033[K"

 

-	// font settings

-	#define	CL_BOLD		"\033[1m"

-	#define CL_NORMAL	CL_RESET

-	#define CL_NONE		CL_RESET

+// font settings

+#define CL_BOLD		"\033[1m"

+#define CL_NORM		CL_RESET

+#define CL_NORMAL	CL_RESET

+#define CL_NONE		CL_RESET

+// foreground color and bold font (bright color on windows)

+#define CL_WHITE	"\033[1;37m"

+#define CL_GRAY		"\033[1;30m"

+#define CL_RED		"\033[1;31m"

+#define CL_GREEN	"\033[1;32m"

+#define CL_YELLOW	"\033[1;33m"

+#define CL_BLUE		"\033[1;34m"

+#define CL_MAGENTA	"\033[1;35m"

+#define CL_CYAN		"\033[1;36m"

 

-	#define	CL_WHITE	"\033[1;37m"

-	#define	CL_GRAY		"\033[1;30m"

-	#define	CL_RED		"\033[1;31m"

-	#define	CL_GREEN	"\033[1;32m"

-	#define	CL_YELLOW	"\033[1;33m"

-	#define	CL_BLUE		"\033[1;34m"

-	#define	CL_MAGENTA	"\033[1;35m"

-	#define	CL_CYAN		"\033[1;36m"

-	

-	#define	CL_BT_YELLOW	"\033[1;33m"

-	#define	CL_WTBL			"\033[37;44m"	// white on blue

-	#define	CL_XXBL			"\033[0;44m"	// default on blue

-	#define CL_PASS			"\033[0;32;42m"	// green on green

-#endif

+// background color

+#define CL_BG_BLACK		"\033[40m"

+#define CL_BG_RED		"\033[41m"

+#define CL_BG_GREEN		"\033[42m"

+#define CL_BG_YELLOW	"\033[43m"

+#define CL_BG_BLUE		"\033[44m"

+#define CL_BG_MAGENTA	"\033[45m"

+#define CL_BG_CYAN		"\033[46m"

+#define CL_BG_WHITE		"\033[47m"

+// foreground color and normal font (normal color on windows)

+#define CL_LT_BLACK		"\033[0;30m"

+#define CL_LT_RED		"\033[0;31m"

+#define CL_LT_GREEN		"\033[0;32m"

+#define CL_LT_YELLOW	"\033[0;33m"

+#define CL_LT_BLUE		"\033[0;34m"

+#define CL_LT_MAGENTA	"\033[0;35m"

+#define CL_LT_CYAN		"\033[0;36m"

+#define CL_LT_WHITE		"\033[0;37m"

+// foreground color and bold font (bright color on windows)

+#define CL_BT_BLACK		"\033[1;30m"

+#define CL_BT_RED		"\033[1;31m"

+#define CL_BT_GREEN		"\033[1;32m"

+#define CL_BT_YELLOW	"\033[1;33m"

+#define CL_BT_BLUE		"\033[1;34m"

+#define CL_BT_MAGENTA	"\033[1;35m"

+#define CL_BT_CYAN		"\033[1;36m"

+#define CL_BT_WHITE		"\033[1;37m"

+

+#define CL_WTBL			"\033[37;44m"	// white on blue

+#define CL_XXBL			"\033[0;44m"	// default on blue

+#define CL_PASS			"\033[0;32;42m"	// green on green

+

+#define CL_SPACE		"           "	// space aquivalent of the print messages

 

+extern int stdout_with_ansisequence; //If the color ansi sequences are to be used. [flaviojs]

 extern int msg_silent; //Specifies how silent the console is. [Skotlex]

 extern char timestamp_format[20]; //For displaying Timestamps [Skotlex]

-extern char tmp_output[1024];

 

 enum msg_type {

 	MSG_NONE,