Fix colouring extra channels which was broken during a git merge from EL.

pjbroad · pjbroad · commit d413dad8c517 · 2018-06-18T09:46:00.000+01:00
diff --git a/chat.c b/chat.c
@@ -2712,7 +2712,13 @@ void update_text_windows (text_message * pmsg)
 }
 
 void recolour_message(text_message *msg){
-	if (msg->chan_idx >= CHAT_CHANNEL1 && msg->chan_idx <= CHAT_CHANNEL3 && msg->len > 0 && msg->data[0] && !msg->deleted)
+	if (msg->chan_idx >= CHAT_CHANNEL1 && msg->chan_idx <=
+#if defined(OTHER_LIFE) && defined(OTHER_LIFE_EXTENDED_CHAT)
+		((loadsofchannels != 3) ? CHAT_CHANNEL32 : CHAT_CHANNEL3)
+#else
+		CHAT_CHANNEL3
+#endif // if defined(OTHER_LIFE) && defined(OTHER_LIFE_EXTENDED_CHAT)
+	  && msg->len > 0 && msg->data[0] && !msg->deleted)
 	{
 		int i;
 		for(i=0; i< MAX_CHANNEL_COLORS; i++)

Original file line number	Diff line number	Diff line change
`@@ -2712,7 +2712,13 @@ void update_text_windows (text_message * pmsg)`
`2712`	`2712`	`}`
`2713`	`2713`
`2714`	`2714`	`void recolour_message(text_message *msg){`
`2715`		`- if (msg->chan_idx >= CHAT_CHANNEL1 && msg->chan_idx <= CHAT_CHANNEL3 && msg->len > 0 && msg->data[0] && !msg->deleted)`
	`2715`	`+ if (msg->chan_idx >= CHAT_CHANNEL1 && msg->chan_idx <=`
	`2716`	`+#if defined(OTHER_LIFE) && defined(OTHER_LIFE_EXTENDED_CHAT)`
	`2717`	`+ ((loadsofchannels != 3) ? CHAT_CHANNEL32 : CHAT_CHANNEL3)`
	`2718`	`+#else`
	`2719`	`+ CHAT_CHANNEL3`
	`2720`	`+#endif // if defined(OTHER_LIFE) && defined(OTHER_LIFE_EXTENDED_CHAT)`
	`2721`	`+ && msg->len > 0 && msg->data[0] && !msg->deleted)`
`2716`	`2722`	`{`
`2717`	`2723`	`int i;`
`2718`	`2724`	`for(i=0; i< MAX_CHANNEL_COLORS; i++)`