handle m with no argument

Author: WinterMute

libogc/console.c

@@ -531,7 +531,6 @@ static struct
 
 static void consoleSetColorState(int code)
 {
-	SYS_Report("code: %d, consoleState: %d\n", code, escapeSeq.state);
 	switch(code)
 	{
 	case 0: // reset
@@ -650,34 +649,28 @@ static void consoleHandleColorEsc(int argCount)
 	for (int arg = 0; arg < argCount; arg++)
 	{
 		int code = escapeSeq.args[arg];
-		SYS_Report("start state: %d\n", escapeSeq.state);
 		switch (escapeSeq.state)
 		{
 		case ESC_BUILDING_UNKNOWN:
 			consoleSetColorState(code);
 			break;
 		case ESC_BUILDING_FORMAT_FG:
-			SYS_Report("format fg %d\n", code);
 			if (code == 5)
 				escapeSeq.state = ESC_BUILDING_FORMAT_FG_NONRGB;
 			else if (code == 2)
 				escapeSeq.state = ESC_BUILDING_FORMAT_FG_RGB;
 			else
 				escapeSeq.state = ESC_BUILDING_UNKNOWN;
-			SYS_Report("state: %d\n", escapeSeq.state);
 			break;
 		case ESC_BUILDING_FORMAT_BG:
-			SYS_Report("format bg %d\n", code);
 			if (code == 5)
 				escapeSeq.state = ESC_BUILDING_FORMAT_BG_NONRGB;
 			else if (code == 2)
 				escapeSeq.state = ESC_BUILDING_FORMAT_BG_RGB;
 			else
 				escapeSeq.state = ESC_BUILDING_UNKNOWN;
-			SYS_Report("state: %d\n", escapeSeq.state);
 			break;
 		case ESC_BUILDING_FORMAT_FG_NONRGB:
-			SYS_Report("format fg non rgb\n");
 			if (code <= 15) {
 				escapeSeq.color.fg  = code;
 				escapeSeq.color.flags &= ~CONSOLE_FG_CUSTOM;
@@ -698,7 +691,6 @@ static void consoleHandleColorEsc(int argCount)
 			escapeSeq.state = ESC_BUILDING_UNKNOWN;
 			break;
 		case ESC_BUILDING_FORMAT_BG_NONRGB:
-			SYS_Report("format bg non rgb\n");
 			if (code <= 15) {
 				escapeSeq.color.bg  = code;
 				escapeSeq.color.flags &= ~CONSOLE_BG_CUSTOM;
@@ -719,7 +711,6 @@ static void consoleHandleColorEsc(int argCount)
 			escapeSeq.state = ESC_BUILDING_UNKNOWN;
 			break;
 		case ESC_BUILDING_FORMAT_FG_RGB:
-			SYS_Report("format fg rgb arg %d\n", escapeSeq.colorArgCount);
 			escapeSeq.colorArgs[escapeSeq.colorArgCount++] = code;
 			if(escapeSeq.colorArgCount == 3)
 			{
@@ -729,7 +720,6 @@ static void consoleHandleColorEsc(int argCount)
 			}
 			break;
 		case ESC_BUILDING_FORMAT_BG_RGB:
-			SYS_Report("format fg rgb arg %d\n", escapeSeq.colorArgCount);
 			escapeSeq.colorArgs[escapeSeq.colorArgCount++] = code;
 			if(escapeSeq.colorArgCount == 3)
 			{
@@ -738,10 +728,8 @@ static void consoleHandleColorEsc(int argCount)
 				escapeSeq.state = ESC_BUILDING_UNKNOWN;
 			}
 		default:
-			SYS_Report("unhandled state %d\n", escapeSeq.state);
 			break;
 		}
-		SYS_Report("end state: %d\n", escapeSeq.state);
 	}
 	escapeSeq.argIdx = 0;
 }
@@ -847,8 +835,6 @@ ssize_t __console_write(struct _reent *r,void *fd,const char *ptr, size_t len)
 	if(!currentConsole) return -1;
 	if(!tmp || len<=0) return -1;
 
-	SYS_Report("write state %d\n", escapeSeq.state);
-
 	while(i<len) {
 
 		chr = *(tmp++);
@@ -993,6 +979,7 @@ ssize_t __console_write(struct _reent *r,void *fd,const char *ptr, size_t len)
 			// Color scan codes
 			//---------------------------------------
 			case 'm':
+				if (escapeSeq.argIdx == 0 && !escapeSeq.hasArg) escapeSeq.args[escapeSeq.argIdx++] = 0;
 				if (escapeSeq.hasArg) escapeSeq.argIdx++;
 				consoleHandleColorEsc(escapeSeq.argIdx);
 				consoleColorApply();