# Patch name: colorchan
# Patch version: 1
# Author's name: Jason Wilcox
# Author's Email: jwilcox@telmaron.com
# Version of PennMUSH: 1.6.10p3
# Date patch made: 3/9/97
# Author is willing to support: Yes
# Patch format: Context Diff
#
# This is a contributed PennMUSH patch. Its use is subject to the
# same restrictions found in PennMUSH's hdrs/copyrite.h file.
#
# No warranty is given for this patch. It is not necessarily going
# to work on your system, with any version of PennMUSH other than
# the one above, etc.
#
# If the author given above was willing to support the patch, you
# should write to the author if you have any questions or problems. Do
# *NOT* send email messages to Javelin or any PennMUSH mailing list about
# this patch!
#
# Below this line is the author's description of the patch,
# followed by the patch itself. If the patch is in context diff
# format, you'll probably apply it by typing: patch < patchfile
# in your top-level MUSH directory, unless instructed otherwise
# below.
#

# NOTE: Original Idea by Wadhah Al-Tailji
# 
# This patch probably isn't all that useful but it does add some color. I'm 
# one of those people that just starting at a monotonous screen loses 
# interest fast, and what do people use alot? CHANNELS. This patch makes 
# the [ and ] yellow and the channel name white. To change the colors  just 
# change the ANSI_* coresponding to the correct %s. 
# Hope you enjoy this patch,
# Jason

*** extchat.c.orig	Sun Mar  9 19:31:11 1997
--- extchat.c	Sat Feb 22 04:10:37 1997
***************
*** 749,761 ****
      }
      if (insert_user_by_dbref(victim, chan)) {
        if (victim != player) {
! 	notify(victim, tprintf("CHAT: %s joins you to channel <%s>.", Name(player), ChanName(chan)));
! 	notify(player, tprintf("CHAT: You join %s to channel <%s>.", Name(victim), ChanName(chan)));
        } else
! 	notify(victim, tprintf("CHAT: You join channel <%s>.", ChanName(chan)));
        if (!Channel_Quiet(chan) && !(Wizard(victim) && Dark(victim)))
! 	channel_broadcast(chan, 1, "<%s> %s has joined this channel.",
! 			  ChanName(chan), Name(victim));
        ChanNumUsers(chan)++;
      } else {
        notify(player, "That player is already on that channel.");
--- 749,762 ----
      }
      if (insert_user_by_dbref(victim, chan)) {
        if (victim != player) {
! 	notify(victim, tprintf("CHAT: %s joins you to channel %s%s[%s%s%s%s]%s.", Name(player), ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, ChanName(chan), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL));
! 	notify(player, tprintf("CHAT: You join %s to channel %s%s[%s%s%s%s]%s.", Name(victim), ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, ChanName(chan), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL));
        } else
! 	notify(victim, tprintf("CHAT: You join channel %s%s[%s%s%s%s]%s.", ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, ChanName(chan), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL));
        if (!Channel_Quiet(chan) && !(Wizard(victim) && Dark(victim)))
! 	channel_broadcast(chan, 1, "%s%s[%s%s%s%s]%s %s has joined this\
!  channel.", ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE,  ChanName(chan),
! 	ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL, Name(victim));
        ChanNumUsers(chan)++;
      } else {
        notify(player, "That player is already on that channel.");
***************
*** 768,780 ****
      }
      if (remove_user_by_dbref(victim, chan)) {
        if (!Channel_Quiet(chan) && !(Wizard(victim) && Dark(victim)))
! 	channel_broadcast(chan, 1, "<%s> %s has left this channel.",
! 			  ChanName(chan), Name(victim));
        if (victim != player) {
! 	notify(victim, tprintf("CHAT: %s removes you from channel <%s>.", Name(player), ChanName(chan)));
! 	notify(player, tprintf("CHAT: You remove %s from channel <%s>.", Name(victim), ChanName(chan)));
        } else
! 	notify(victim, tprintf("CHAT: You leave channel <%s>.", ChanName(chan)));
      } else {
        notify(player, "That player is not on that channel.");
      }
--- 769,784 ----
      }
      if (remove_user_by_dbref(victim, chan)) {
        if (!Channel_Quiet(chan) && !(Wizard(victim) && Dark(victim)))
! 	channel_broadcast(chan, 1, "%s%s[%s%s%s%s]%s %s has left this\
!  channel.", ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, ChanName(chan),
! 	 ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL, Name(victim));
        if (victim != player) {
! 	notify(victim, tprintf("CHAT: %s removes you from channel %s[%s%s%s%s]%s.", Name(player),
! 	ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, ChanName(chan), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL));
! 	notify(player, tprintf("CHAT: You remove %s from channel %s%s[%s%s%s%s]%s.", Name(victim),
! 	ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, ChanName(chan), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL));
        } else
! 	notify(victim, tprintf("CHAT: You leave channel %s%s[%s%s%s%s]%s.", ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, ChanName(chan), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL));
      } else {
        notify(player, "That player is not on that channel.");
      }
***************
*** 846,860 ****
     */
    switch (key) {
    case 1:
!     channel_broadcast(chan, 0, "<%s> %s%s%s", ChanName(chan),
! 		      Name(player), gap, arg1);
      if (!onchannel(player, chan))
        notify(player, tprintf("To channel %s: %s%s%s", ChanName(chan),
  			     Name(player), gap, arg1));
      break;
    case 2:
!     channel_broadcast(chan, 0, "<%s> %s says, \"%s\"", ChanName(chan),
! 		      Name(player), arg1);
      if (!onchannel(player, chan))
        notify(player, tprintf("To channel %s: %s says, \"%s\"",
  			     ChanName(chan), Name(player), arg1));
--- 850,866 ----
     */
    switch (key) {
    case 1:
!     channel_broadcast(chan, 0, "%s%s[%s%s%s%s]%s %s%s%s", ANSI_HILITE,
!     ANSI_YELLOW, ANSI_WHITE, ChanName(chan), ANSI_HILITE,
!     ANSI_YELLOW, ANSI_NORMAL, Name(player), gap, arg1);
      if (!onchannel(player, chan))
        notify(player, tprintf("To channel %s: %s%s%s", ChanName(chan),
  			     Name(player), gap, arg1));
      break;
    case 2:
!     channel_broadcast(chan, 0, "%s%s[%s%s%s%s]%s %s says, \"%s\"",
!     ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, ChanName(chan), ANSI_HILITE,
!     ANSI_YELLOW, ANSI_NORMAL, Name(player), arg1);
      if (!onchannel(player, chan))
        notify(player, tprintf("To channel %s: %s says, \"%s\"",
  			     ChanName(chan), Name(player), arg1));
*** bsd.c.orig	Mon Jan  6 18:30:39 1997
--- bsd.c	Sun Feb 23 18:39:21 1997
***************
*** 59,64 ****
--- 59,67 ----
  #ifdef I_LIMITS
  #include <limits.h>
  #endif
+ #ifdef I_ARPA_INET
+ #include <arpa/inet.h>
+ #endif
  
  #include "conf.h"
  #include "mushdb.h"
***************
*** 2272,2278 ****
      u = onchannel(player, c);
      if (u &&!Channel_Quiet(c) && (Channel_Admin(c) || Channel_Wizard(c)
  			      || (!Chanuser_Hide(u) && !Dark(player)))) {
!       channel_broadcast(c, 1, "<%s> %s", ChanName(c), tbuf1);
      }
    }
  #else
--- 2275,2281 ----
      u = onchannel(player, c);
      if (u &&!Channel_Quiet(c) && (Channel_Admin(c) || Channel_Wizard(c)
  			      || (!Chanuser_Hide(u) && !Dark(player)))) {
!       channel_broadcast(c, 1, "%s%s[%s%s%s%s]%s %s", ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, ChanName(c), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL, tbuf1);
      }
    }
  #else
***************
*** 2284,2297 ****
    if (!Dark(player)) {
      for (b = 1; b <= 32; b++) {
        if ((chan & mask) && !QuietChan(mask))
! 	channel_broadcast(mask, "<%s> %s", channel_name(mask), tbuf1);
        mask <<= 1;
      }
    } else {
      for (b = 1; b <= 32; b++) {
        if ((chan & mask) && !QuietChan(mask) &&
  	  (ChanPrivs(mask) != CHP_PUBLIC))
! 	channel_broadcast(mask, "<%s> %s", channel_name(mask), tbuf1);
        mask <<= 1;
      }
    }
--- 2287,2300 ----
    if (!Dark(player)) {
      for (b = 1; b <= 32; b++) {
        if ((chan & mask) && !QuietChan(mask))
! 	channel_broadcast(mask, "%s%s[%s%s%s%s]%s %s", ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, channel_name(mask), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL, tbuf1);
        mask <<= 1;
      }
    } else {
      for (b = 1; b <= 32; b++) {
        if ((chan & mask) && !QuietChan(mask) &&
  	  (ChanPrivs(mask) != CHP_PUBLIC))
! 	channel_broadcast(mask, "%s%s[%s%s%s%s]%s %s", ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, channel_name(mask), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL,  tbuf1);
        mask <<= 1;
      }
    }
***************
*** 2537,2543 ****
      if (u &&
  	(!Dark(player) || Channel_Admin(c) || Channel_Wizard(c)) &&
  	!Chanuser_Hide(u) && !Channel_Quiet(c)) {
!       channel_broadcast(c, 1, "<%s> %s", ChanName(c), tbuf1);
      }
    }
  #else
--- 2540,2547 ----
      if (u &&
  	(!Dark(player) || Channel_Admin(c) || Channel_Wizard(c)) &&
  	!Chanuser_Hide(u) && !Channel_Quiet(c)) {
!       channel_broadcast(c, 1, "%s%s[%s%s%s%s]%s %s", ANSI_HILITE, 
! ANSI_YELLOW, ANSI_WHITE, ChanName(c), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL, tbuf1);
      }
    }
  #else
***************
*** 2548,2561 ****
    if (!Dark(player)) {
      for (b = 1; b <= 32; b++) {
        if ((chan & mask) && !QuietChan(mask))
! 	channel_broadcast(mask, "<%s> %s", channel_name(mask), tbuf1);
        mask <<= 1;
      }
    } else {
      for (b = 1; b <= 32; b++) {
        if ((chan & mask) && !QuietChan(mask) &&
  	  (ChanPrivs(mask) != CHP_PUBLIC))
! 	channel_broadcast(mask, "<%s> %s", channel_name(mask), tbuf1);
        mask <<= 1;
      }
    }
--- 2552,2565 ----
    if (!Dark(player)) {
      for (b = 1; b <= 32; b++) {
        if ((chan & mask) && !QuietChan(mask))
! 	channel_broadcast(mask, "%s%s[%s%s%s%s]%s %s", ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, channel_name(mask), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL, tbuf1);
        mask <<= 1;
      }
    } else {
      for (b = 1; b <= 32; b++) {
        if ((chan & mask) && !QuietChan(mask) &&
  	  (ChanPrivs(mask) != CHP_PUBLIC))
! 	channel_broadcast(mask, "%s%s[%s%s%s%s]%s %s", ANSI_HILITE, ANSI_YELLOW, ANSI_WHITE, channel_name(mask), ANSI_HILITE, ANSI_YELLOW, ANSI_NORMAL, tbuf1);
        mask <<= 1;
      }
    }
***************
*** 2742,2752 ****
    if (options.use_dns) {
      he = gethostbyaddr((char *) &nums.s_addr, sizeof(nums.s_addr), AF_INET);
      if (he == NULL)
!       return ((char *) inet_ntoa(nums));	/* IP numbers */
      else
!       return ((char *) he->h_name);	/* hostname */
    } else
!     return ((char *) inet_ntoa(nums));
  }
  
  dbref
--- 2746,2756 ----
    if (options.use_dns) {
      he = gethostbyaddr((char *) &nums.s_addr, sizeof(nums.s_addr), AF_INET);
      if (he == NULL)
!       return (inet_ntoa(nums));	/* IP numbers */
      else
!       return (he->h_name);	/* hostname */
    } else
!     return (inet_ntoa(nums));
  }
  
  dbref
***************
*** 3484,3486 ****
--- 3488,3491 ----
    return getdtablesize();
  }
  #endif				/* WIN32 */
+