Ticket #7426: victim_nwho.diff

diff --exclude-from .pennmush_excludes -rc pennmush-1.8.3p4/game/txt/hlp/pennfunc.hlp punnmush-1.8.3p4/game/txt/hlp/pennfunc.hlp
*** pennmush-1.8.3p4/game/txt/hlp/pennfunc.hlp  2007-07-07 17:45:00.000000000 -0500
--- punnmush-1.8.3p4/game/txt/hlp/pennfunc.hlp  2007-08-12 14:04:08.000000000 -0500
***************
*** 2817,2831 ****
    object is @created (or @dug, or @opened, or @pcreated, etc.), it
    will have this dbref.
  
- & NMWHO()
-   nmwho()
- 
-   This returns a count of all currently connected, non-hidden players.
-   It's exactly the same as nwho() used by a mortal, and is suitable
-   for use on privileged global objects who need an unprivileged count
-   of who's online.
- 
- See also: nwho(), mwho(), xmwho()
  & NOR()
    nor(<boolean>[, ... , <booleanN>])
  
--- 2817,2822 ----
***************
*** 2894,2906 ****
    nvthings(<object>) is identical to words(lvthings(<object>))
  
  See also: ncon(), nexits(), xthings(), lthings(), lvthings()
  & NWHO()
    nwho()
  
!   This returns a count of all currently-connected players. When
    mortals use this function, DARK wizards or royalty are NOT counted.
  
! See also: lwho(), nmwho(), xwho()
  & OBJ()
    obj(<object>)
  
--- 2885,2909 ----
    nvthings(<object>) is identical to words(lvthings(<object>))
  
  See also: ncon(), nexits(), xthings(), lthings(), lvthings()
+ & NMWHO()
  & NWHO()
    nwho()
+   nwho(<viewer>)
+   nmwho()
  
!   nwho() returns a count of all currently-connected players. When
    mortals use this function, DARK wizards or royalty are NOT counted.
  
!   nmwho() returns a count of all currently connected, non-hidden players.
!   It's exactly the same as nwho() used by a mortal, and is suitable
!   for use on privileged global objects that always need an unprivileged
!   count of who is online.
! 
!   If nwho() is given an argument, and is used by an object that can see
!   DARK and Hidden players, nwho() returns the count of online players
!   based on what <viewer> can see.
! 
! See also: lwho(), mwho(), xwho(), xmwho()
  & OBJ()
    obj(<object>)
  
diff --exclude-from .pennmush_excludes -rc pennmush-1.8.3p4/src/bsd.c punnmush-1.8.3p4/src/bsd.c
*** pennmush-1.8.3p4/src/bsd.c  2007-07-08 00:06:23.000000000 -0500
--- punnmush-1.8.3p4/src/bsd.c  2007-08-12 13:49:38.000000000 -0500
***************
*** 3614,3624 ****
  FUNCTION(fun_nwho)
  {
    DESC *d;
    int count = 0;
!   int powered = (*(called_as + 1) != 'M');
  
    DESC_ITER_CONN(d) {
!     if (!Hidden(d) || (powered && Priv_Who(executor))) {
        count++;
      }
    }
--- 3614,3641 ----
  FUNCTION(fun_nwho)
  {
    DESC *d;
+   dbref victim;
    int count = 0;
!   int powered = ((*(called_as + 1) != 'M') && Priv_Who(executor));
! 
!   if (nargs && args[0] && *args[0]) {
!     /* An argument was given. Find the victim and choose the lowest
!      * perms possible */
!     if (!powered) {
!       safe_str(T(e_perm), buff, bp);
!       return;
!     }
!     if ((victim = noisy_match_result(executor, args[0], NOTYPE,
!                                      MAT_EVERYTHING)) == 0) {
!       safe_str(T(e_notvis), buff, bp);
!       return;
!     }
!     if (!Priv_Who(victim))
!       powered = 0;
!   }
  
    DESC_ITER_CONN(d) {
!     if (!Hidden(d) || powered) {
        count++;
      }
    }
diff --exclude-from .pennmush_excludes -rc pennmush-1.8.3p4/src/function.c punnmush-1.8.3p4/src/function.c
*** pennmush-1.8.3p4/src/function.c 2007-07-07 17:45:00.000000000 -0500
--- punnmush-1.8.3p4/src/function.c 2007-08-12 09:49:43.000000000 -0500
***************
*** 563,569 ****
    {"NVEXITS", fun_dbwalker, 1, 1, FN_REG},
    {"NVPLAYERS", fun_dbwalker, 1, 1, FN_REG},
    {"NVTHINGS", fun_dbwalker, 1, 1, FN_REG},
!   {"NWHO", fun_nwho, 0, 0, FN_REG},
    {"OBJ", fun_obj, 1, 1, FN_REG},
    {"OBJEVAL", fun_objeval, 2, -2, FN_NOPARSE},
    {"OBJID", fun_objid, 1, 1, FN_REG},
--- 563,569 ----
    {"NVEXITS", fun_dbwalker, 1, 1, FN_REG},
    {"NVPLAYERS", fun_dbwalker, 1, 1, FN_REG},
    {"NVTHINGS", fun_dbwalker, 1, 1, FN_REG},
!   {"NWHO", fun_nwho, 0, 1, FN_REG},
    {"OBJ", fun_obj, 1, 1, FN_REG},
    {"OBJEVAL", fun_objeval, 2, -2, FN_NOPARSE},
    {"OBJID", fun_objid, 1, 1, FN_REG},