Ticket #7570: chat-title-no-rhs.patch.txt

*** src/extchat.c.orig  Fri Oct  5 23:36:32 2007
--- src/extchat.c   Wed Mar  5 04:00:50 2008
***************
*** 102,107 ****
--- 102,109 ----
  
  CHAN *channels;    /**< Pointer to channel list */
  
+ extern int rhs_present; /* from command.c */
+ 
  static PRIV priv_table[] = {
    {"Disabled", 'D', CHANNEL_DISABLED, CHANNEL_DISABLED},
    {"Admin", 'A', CHANNEL_ADMIN | CHANNEL_PLAYER, CHANNEL_ADMIN},
***************
*** 2028,2033 ****
--- 2030,2051 ----
      notify(player, T("You must specify a channel."));
      return;
    }
+   
+   test_channel(player, name, c);
+   u = onchannel(player, c);
+   if (!u) {
+     notify_format(player, T("You are not on channel <%s>."), ChanName(c));
+     return;
+   }
+   
+   if (!rhs_present) {
+     if (strlen(CUtitle(u)) == 0) 
+       notify_format(player, T("You have no title set on <%s>."), ChanName(c));
+     else
+       notify_format(player, T("Your title on <%s> is '%s'."), ChanName(c), CUtitle(u));
+     return;
+   }
+   
    if (!title)
      title = (const char *) "";
  
***************
*** 2043,2054 ****
        return;
      }
    }
!   test_channel(player, name, c);
!   u = onchannel(player, c);
!   if (!u) {
!     notify_format(player, T("You are not on channel <%s>."), ChanName(c));
!     return;
!   }
    strcpy(CUtitle(u), title);
    if (!Quiet(player))
      notify_format(player, T("Title %s for %schannel <%s>."),
--- 2061,2067 ----
        return;
      }
    }
! 
    strcpy(CUtitle(u), title);
    if (!Quiet(player))
      notify_format(player, T("Title %s for %schannel <%s>."),
*** game/txt/hlp/pennchat.hlp.orig  Mon Jul  9 04:50:12 2007
--- game/txt/hlp/pennchat.hlp   Wed Mar  5 04:06:08 2008
***************
*** 154,160 ****
  & @channel2
    @channel/who <channel>
    @channel/hide <channel> = <yes|no>
!   @channel/title <channel> = <string>
  
    The @channel/who command shows you who is currently on a channel,
    if you are permitted to see it.
--- 154,160 ----
  & @channel2
    @channel/who <channel>
    @channel/hide <channel> = <yes|no>
!   @channel/title <channel>[=<string>]
  
    The @channel/who command shows you who is currently on a channel,
    if you are permitted to see it.
***************
*** 165,173 ****
    @channel/hide <channel>=no to reappear.
  
    @channel/title lets you set a title to appear before your name
!   when you speak on the channel. If you leave the channel, your
!   title is cleared; use @channel/gag instead (see help @channel3).
!   You should escape any commas in your title with backslashes.
  
    See "help @channel3" for more.
  & @channel3
--- 165,174 ----
    @channel/hide <channel>=no to reappear.
  
    @channel/title lets you set a title to appear before your name
!   when you speak on the channel, or check your current title. If
!   you leave the channel, your title is cleared; use @channel/gag
!   instead (see help @channel3). You should escape any commas in
!   your title with backslashes.
  
    See "help @channel3" for more.
  & @channel3