PennMUSH Community

Changeset 429

Show
Ignore:
Timestamp:
08/12/06 18:08:34 (2 years ago)
Author:
pennmush
Message:

PennMUSH 1.7.7p15 Archival

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.7.7/CHANGES.176

    r427 r429  
    1313 
    1414========================================================================== 
     15 
     16Version 1.7.6 patchlevel 11                     June 1, 2003 
     17 
     18Minor changes: 
     19   * The restart script now insures that GAMEDIR is a real directory 
     20     and CONF_FILE exists therein before proceeding. Suggested by 
     21     Philip Mak. 
     22   * Attribute flag setting messages are more verbose. Suggested by 
     23     Mike Griffiths 
     24   * See_All players may use the ports() function. Suggested by  
     25     Mike Griffiths. 
     26Fixes: 
     27   * Wizards can no longer @chzone God. Report by Kevin@M*U*S*H. 
     28   * Help fixes by Mike Griffiths. 
    1529 
    1630Version 1.7.6 patchlevel 10                     May 13, 2003 

  • 1.7.7/CHANGES.177

    r427 r429  
    1919========================================================================== 
    2020 
     21Version 1.7.7 patchlevel 15                     June 1, 2003 
     22 
     23Fixes: 
     24  * Problem with checking command flag masks when the number of 
     25    flags was an even multiple of 8. Reported by Nymeria and  
     26    Mordie@M*U*S*H. 
     27  * Tweak to improve efficiency of ancestor checking code and delint 
     28    warning reported by Cheetah@M*U*S*H. 
     29  * SESSION output no longer misaligned with 5-digit dbrefs. 
     30    Reported by Cheetah@M*U*S*H. [TAP]. 
     31  * Fixes from 1.7.6p11. 
     32  * game/txt/index-files.pl now uses locale information in the 
     33    environment to, e.g., correctly lowercase accented characters. 
     34    Report by Krad@M*U*S*H. 
     35  * Modified several Makefile.SH targets to prevent Javelin from 
     36    releasing patches that don't have the autogenerated files  
     37    up-to-date for Windows folks. 
     38  * Removed some dependence on typedefs that may or may not be in system 
     39    header files. [SW] 
     40  * Patch compiler warnings. [SW,EEH] 
     41  * Help fixes by Mike Griffiths and Oriens@Alexandria. 
     42 
     43   
    2144Version 1.7.7 patchlevel 14                     May 22, 2003 
    2245 

  • 1.7.7/Makefile.SH

    r425 r429  
    5757GLOBAL_INSTALL=/usr/libexec/pennmush 
    5858 
    59 all: config.h options.h hdrs/cmds.h hdrs/funs.h hdrs/switches.h src/switchinc.c game/mush.cnf 
     59all: config.h options.h autogen game/mush.cnf 
    6060    @echo "Making all in src." 
    6161    (cd src; make all "CC=$(CC)" "CCFLAGS=$(CCFLAGS)" \ 
    …… 
    7474    exit 1 
    7575 
     76autogen: hdrs/cmds.h hdrs/funs.h hdrs/switches.h 
     77 
    7678hdrs/cmds.h: src/cmds.c src/command.c src/cque.c src/help.c src/set.c Patchlevel 
    7779    (cd utils; sh mkcmds.sh commands) 
    …… 
    8082    (cd utils; sh mkcmds.sh switches) 
    8183 
    82 #src/switchinc.c: hdrs/switches.h 
    83 # (cd utils; sh mkcmds.sh switches) 
     84src/switchinc.c: src/SWITCHES Patchlevel 
     85  (cd utils; sh mkcmds.sh switches) 
    8486 
    8587hdrs/funs.h: src/fun*.c src/bsd.c src/conf.c src/extmail.c src/help.c src/wiz.c Patchlevel 
    …… 
    121123 
    122124versions: CHANGES* 
    123     -rm -rf CHANGES*~ CHANGES*bak 
    124     utils/mkvershlp.pl game/txt/hlp CHANGES* 
     125    -@rm -rf CHANGES*~ CHANGES*bak 
     126    @utils/mkvershlp.pl game/txt/hlp CHANGES* 
    125127 
    126128safety: 
    …… 
    135137# REQUIRES GNU INDENT! DON'T INDENT WITH ANYTHING ELSE! 
    136138indent: 
    137     (cd utils; sh mkcmds.sh) 
    138     (cd src; make indent) 
     139    @(cd src; make indent) 
    139140 
    140141protoize: 
    …… 
    201202      game/txt/* game/txt/nws/* game/txt/evt/* game/txt/hlp/* ) 
    202203 
    203 diffs: versions 
     204diffs: 
    204205    @make indent > /dev/null 2>&1 
    205     @(cd utils; sh mkcmds.sh) > /dev/null 2>&1 
     206    @make versions > /dev/null 2>&1 
     207    @make touchswitches > /dev/null 2>&1 
     208    @make autogen > /dev/null 2>&1 
    206209    @(prcs diff -r$(VS) -N pennmush `cat MANIFEST` | grep -v 'Index:') 
     210 
     211checkin: versions autogen 
     212    @prcs checkin 
    207213 
    208214patch: versions 
    …… 
    222228    gzip /tmp/dist.tar 
    223229 
    224 dist.tar: distclean versions 
    225     (cd utils; sh mkcmds.sh) 
     230touchswitches: 
     231    @touch src/SWITCHES 
     232 
     233dist.tar: indent distclean versions touchswitches autogen 
    226234    makedist -c pennmush 
    227235    tar -cvf /tmp/dist.tar pennmush 

  • 1.7.7/Patchlevel

    r427 r429  
    11Do not edit this file. It is maintained by the official PennMUSH patches. 
    2 This is PennMUSH 1.7.7p14 
     2This is PennMUSH 1.7.7p15 

  • 1.7.7/game/restart

    r427 r429  
    99# script lives in by hand. 
    1010GAMEDIR=`which $0 | sed 's/\/[^\/]*$//'` 
    11 cd $GAMEDIR 
    12 echo Running from `pwd` 
    13  
    1411 
    1512# The config file 
    …… 
    1815# The error log file 
    1916LOG=log/netmush.log 
     17 
     18 
     19if [ ! -d $GAMEDIR ]; then 
     20  echo "GAMEDIR doesn't appear to be a directory. It's: $GAMEDIR" 
     21  exit 1 
     22fi 
     23 
     24cd $GAMEDIR 
     25echo Running from `pwd` 
     26 
     27if [ ! -f $CONF_FILE ]; then 
     28  echo "CONF_FILE doesn't exist. It's: $CONF_FILE" 
     29  exit 1 
     30fi 
    2031 
    2132# Internationalization stuff 

  • 1.7.7/game/txt/hlp/pennflag.hlp

    r427 r429  
    532532  type ancestor, and prevents attributes from being 
    533533  retrieved from the ancestor. It has no effect on the object's  
    534   true @parents, only on the its use of the ancestor. 
     534  true @parents, only on its use of the ancestor. 
    535535 
    536536  See also: @parent, ancestors 

  • 1.7.7/game/txt/hlp/pennfunc.hlp

    r427 r429  
    12661266  @nameaccent, if any. 
    12671267 
    1268   Related functions: NAME(), ACCNAME(), INAME() 
     1268  Related functions: NAME(), FULLNAME(), INAME() 
    12691269& FRACTION() 
    12701270  fraction(<number>) 
    …… 
    13471347  grep(<object>,<attrs>,<pattern>) 
    13481348  regrep(<object>,<attrs>,<regexp>) 
    1349    
    1350   This function returns a list of attributes on <object> containing 
     1349  grepi(<object>,<attrs>,<pattern>) 
     1350  regrepi(<object>,<attrs>,<regexp>) 
     1351   
     1352  These functions return a list of attributes on <object> containing 
    13511353  <pattern> (or matching <regexp>).  <attrs> is a wildcard pattern for 
    13521354  attribute names to search; if you want to search all attributes, use "*". 
    …… 
    13591361  <pattern> is NOT wildcard matched. 
    13601362 
    1361   These functions are case-sensitive. grepi()/regrepi() are case-insensitive. 
    1362 & GREPI() 
    1363   grepi(<object>,<attrs>,<pattern>) 
    1364   regrepi(<object>,<attrs>,<regexp>) 
    1365   
    1366   This function works exactly like grep or regrep, but is case-insensitive. 
    1367   See "help grep()" or "help regrep()" for details.  
     1363  grep()/regrep() are case-sensitive. grepi()/regrepi() are case-insensitive. 
    13681364& GT() 
    13691365  gt(<num>,<num>) 
    …… 
    25672563  
    25682564  This function returns the list of descriptors ("ports") that a player, 
    2569   specified by full player name, or by dbref, is connected to. Only Wizards 
    2570   and Royalty may use this function; if a user lacks the privileges, or the 
    2571   player is not connected, an empty list is returned. Otherwise, a list of 
    2572   ports is returned in order of most recent connection to least recent 
    2573   connection. 
     2565  specified by full player name, or by dbref, is connected to. Only players 
     2566  who are See_All or privileged may use this function; in other cases, 
     2567  an empty list is returned. Otherwise, a list of ports is returned in  
     2568  order of most recent connection to least recent connection. 
    25742569& POS() 
    25752570  pos(<string1>,<string2>) 
    …… 
    26492644  See also: edit(), regmatch() 
    26502645& REGMATCH() 
     2646& REGMATCHI() 
    26512647  (Help text from TinyMUSH 2.2.4, with permission) 
    26522648  regmatch(<string>,<regexp>[,<register list>]) 

  • 1.7.7/game/txt/hlp/penntop.hlp

    r427 r429  
    903903  executed, "me", for example, refers to the child, not the parent, 
    904904  and the $-command's associated actions are performed by the child. 
    905   However, uselocks are checked on parents. Failing one stops looking 
    906   for a matching command on that parent chain. 
    907905 
    908906(continued in help parents3) 

  • 1.7.7/game/txt/hlp/pennv176.hlp

    r427 r429  
     1& 1.7.6p11 
     2Version 1.7.6 patchlevel 11                     June 1, 2003 
     3 
     4Minor changes: 
     5   * The restart script now insures that GAMEDIR is a real directory 
     6     and CONF_FILE exists therein before proceeding. Suggested by 
     7     Philip Mak. 
     8   * Attribute flag setting messages are more verbose. Suggested by 
     9     Mike Griffiths 
     10   * See_All players may use the ports() function. Suggested by  
     11     Mike Griffiths. 
     12Fixes: 
     13   * Wizards can no longer @chzone God. Report by Kevin@M*U*S*H. 
     14   * Help fixes by Mike Griffiths. 
     15 
    116& 1.7.6p10 
    217Version 1.7.6 patchlevel 10                     May 13, 2003 

  • 1.7.7/game/txt/hlp/pennv177.hlp

    r427 r429  
    1 & 1.7.7p14 
     1& 1.7.7p15 
    22& changes 
    33This is a list of changes in this patchlevel which are probably of 
    …… 
    1212be read in 'help patchlevels'. 
    1313 
     14Version 1.7.7 patchlevel 15                     June 1, 2003 
     15 
     16Fixes: 
     17  * Problem with checking command flag masks when the number of 
     18    flags was an even multiple of 8. Reported by Nymeria and  
     19    Mordie@M*U*S*H. 
     20  * Tweak to improve efficiency of ancestor checking code and delint 
     21    warning reported by Cheetah@M*U*S*H. 
     22  * SESSION output no longer misaligned with 5-digit dbrefs. 
     23    Reported by Cheetah@M*U*S*H. [TAP]. 
     24  * Fixes from 1.7.6p11. 
     25  * game/txt/index-files.pl now uses locale information in the 
     26    environment to, e.g., correctly lowercase accented characters. 
     27    Report by Krad@M*U*S*H. 
     28  * Modified several Makefile.SH targets to prevent Javelin from 
     29    releasing patches that don't have the autogenerated files  
     30    up-to-date for Windows folks. 
     31  * Removed some dependence on typedefs that may or may not be in system 
     32    header files. [SW] 
     33  * Patch compiler warnings. [SW,EEH] 
     34  * Help fixes by Mike Griffiths and Oriens@Alexandria. 
     35 
     36   
     37& 1.7.7p14 
    1438Version 1.7.7 patchlevel 14                     May 22, 2003 
    1539 

  • 1.7.7/game/txt/hlp/pennvOLD.hlp

    r427 r429  
    44184418type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3' 
    44194419 
    4420 1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 
    4421 1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 
     44201.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 
     44211.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 
    442244221.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 
    442344231.7.4: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 

  • 1.7.7/game/txt/index-files.pl

    r425 r429  
    1818use strict; 
    1919use Getopt::Long; 
     20use locale; 
    2021my (@entries, @aentries); 
    2122 

  • 1.7.7/hdrs/attrib.h

    r427 r429  
    5656extern int string_to_atrflag(dbref player, const char *p); 
    5757extern void init_atr_name_tree(void); 
    58 extern unsigned char *const atr_get_compressed_data(ATTR *atr); 
    59 extern char *const atr_value(ATTR *atr); 
     58extern unsigned const char *atr_get_compressed_data(ATTR *atr); 
     59extern char *atr_value(ATTR *atr); 
    6060extern char *safe_atr_value(ATTR *atr); 
    6161extern void atr_migrate(int amount); 

  • 1.7.7/hdrs/switches.h

    r427 r429  
    4646#define SWITCH_FOLDERS 45 
    4747#define SWITCH_FORWARD 46 
    48 #define SWITCH_FSTATS 47 
    49 #define SWITCH_FULL 48 
    50 #define SWITCH_FUNCTIONS 49 
    51 #define SWITCH_FWD 50 
    52 #define SWITCH_GAG 51 
    53 #define SWITCH_GLOBALS 52 
    54 #define SWITCH_HEADER 53 
    55 #define SWITCH_HERE 54 
    56 #define SWITCH_HIDE 55 
    57 #define SWITCH_ILIST 56 
    58 #define SWITCH_INVENTORY 57 
    59 #define SWITCH_IPRINT 58 
    60 #define SWITCH_JOIN 59 
    61 #define SWITCH_LIST 60 
    62 #define SWITCH_LOWERCASE 61 
    63 #define SWITCH_ME 62 
    64 #define SWITCH_MEMBERS 63 
    65 #define SWITCH_MOD 64 
    66 #define SWITCH_MORTAL 65 
    67 #define SWITCH_MOTD 66 
    68 #define SWITCH_MUTE 67 
    69 #define SWITCH_NAME 68 
    70 #define SWITCH_NO 69 
    71 #define SWITCH_NOEVAL 70 
    72 #define SWITCH_NOFLAGCOPY 71 
    73 #define SWITCH_NOISY 72 
    74 #define SWITCH_NOSIG 73 
    75 #define SWITCH_NOSPACE 74 
    76 #define SWITCH_NOTIFY 75 
    77 #define SWITCH_NUKE 76 
    78 #define SWITCH_OFF 77 
    79 #define SWITCH_ON 78 
    80 #define SWITCH_OUTSIDE 79 
    81 #define SWITCH_OVERRIDE 80 
    82 #define SWITCH_PAGING 81 
    83 #define SWITCH_PANIC 82 
    84 #define SWITCH_PARANOID 83 
    85 #define SWITCH_PLAYERS 84 
    86 #define SWITCH_PORT 85 
    87 #define SWITCH_PRESERVE 86 
    88 #define SWITCH_PRINT 87 
    89 #define SWITCH_PRIVS 88 
    90 #define SWITCH_PURGE 89 
    91 #define SWITCH_QUICK 90 
    92 #define SWITCH_QUIET 91 
    93 #define SWITCH_READ 92 
    94 #define SWITCH_REBOOT 93 
    95 #define SWITCH_RECALL 94 
    96 #define SWITCH_REGIONS 95 
    97 #define SWITCH_REGISTER 96 
    98 #define SWITCH_REMOVE 97 
    99 #define SWITCH_RENAME 98 
    100 #define SWITCH_RESTORE 99 
    101 #define SWITCH_RESTRICT 100 
    102 #define SWITCH_RETROACTIVE 101 
    103 #define SWITCH_ROOM 102 
    104 #define SWITCH_ROOMS 103 
    105 #define SWITCH_SEE 104 
    106 #define SWITCH_SEEFLAG 105 
    107 #define SWITCH_SELF 106 
    108 #define SWITCH_SEND 107 
    109 #define SWITCH_SET 108 
    110 #define SWITCH_SILENT 109 
    111 #define SWITCH_SKIPDEFAULTS 110 
    112 #define SWITCH_SPEAK 111 
    113 #define SWITCH_STATS 112 
    114 #define SWITCH_SUMMARY 113 
    115 #define SWITCH_TABLES 114 
    116 #define SWITCH_TAG 115 
    117 #define SWITCH_TELEPORT 116 
    118 #define SWITCH_TF 117 
    119 #define SWITCH_THINGS 118 
    120 #define SWITCH_TITLE 119 
    121 #define SWITCH_TRACE 120 
    122 #define SWITCH_UNCLEAR 121 
    123 #define SWITCH_UNFOLDER 122 
    124 #define SWITCH_UNGAG 123 
    125 #define SWITCH_UNHIDE 124 
    126 #define SWITCH_UNMUTE 125 
    127 #define SWITCH_UNTAG 126 
    128 #define SWITCH_UNTIL 127 
    129 #define SWITCH_URGENT 128 
    130 #define SWITCH_USEFLAG 129 
    131 #define SWITCH_WHAT 130 
    132 #define SWITCH_WHO 131 
    133 #define SWITCH_WIPE 132 
    134 #define SWITCH_WIZ 133 
    135 #define SWITCH_WIZARD 134 
    136 #define SWITCH_YES 135 
    137 #define SWITCH_ZONE 136 
     48#define SWITCH_FREESPACE 47 
     49#define SWITCH_FSTATS 48 
     50#define SWITCH_FULL 49 
     51#define SWITCH_FUNCTIONS 50 
     52#define SWITCH_FWD 51 
     53#define SWITCH_GAG 52 
     54#define SWITCH_GLOBALS 53 
     55#define SWITCH_HEADER 54 
     56#define SWITCH_HERE 55 
     57#define SWITCH_HIDE 56 
     58#define SWITCH_ILIST 57 
     59#define SWITCH_INVENTORY 58 
     60#define SWITCH_IPRINT 59 
     61#define SWITCH_JOIN 60 
     62#define SWITCH_LIST 61 
     63#define SWITCH_LOWERCASE 62 
     64#define SWITCH_ME 63 
     65#define SWITCH_MEMBERS 64 
     66#define SWITCH_MOD 65 
     67#define SWITCH_MORTAL 66 
     68#define SWITCH_MOTD 67 
     69#define SWITCH_MUTE 68 
     70#define SWITCH_NAME 69 
     71#define SWITCH_NO 70 
     72#define SWITCH_NOEVAL 71 
     73#define SWITCH_NOFLAGCOPY 72 
     74#define SWITCH_NOISY 73 
     75#define SWITCH_NOSIG 74 
     76#define SWITCH_NOSPACE 75 
     77#define SWITCH_NOTIFY 76 
     78#define SWITCH_NUKE 77 
     79#define SWITCH_OFF 78 
     80#define SWITCH_ON 79 
     81#define SWITCH_OUTSIDE 80 
     82#define SWITCH_OVERRIDE 81 
     83#define SWITCH_PAGING 82 
     84#define SWITCH_PANIC 83 
     85#define SWITCH_PARANOID 84 
     86#define SWITCH_PLAYERS 85 
     87#define SWITCH_PORT 86 
     88#define SWITCH_PRESERVE 87 
     89#define SWITCH_PRINT 88 
     90#define SWITCH_PRIVS 89 
     91#define SWITCH_PURGE 90 
     92#define SWITCH_QUICK 91 
     93#define SWITCH_QUIET 92 
     94#define SWITCH_READ 93 
     95#define SWITCH_REBOOT 94 
     96#define SWITCH_RECALL 95 
     97#define SWITCH_REGIONS 96 
     98#define SWITCH_REGISTER 97 
     99#define SWITCH_REMOVE 98 
     100#define SWITCH_RENAME 99 
     101#define SWITCH_RESTORE 100 
     102#define SWITCH_RESTRICT 101 
     103#define SWITCH_RETROACTIVE 102 
     104#define SWITCH_ROOM 103 
     105#define SWITCH_ROOMS 104 
     106#define SWITCH_SEE 105 
     107#define SWITCH_SEEFLAG 106 
     108#define SWITCH_SELF 107 
     109#define SWITCH_SEND 108 
     110#define SWITCH_SET 109 
     111#define SWITCH_SILENT 110 
     112#define SWITCH_SKIPDEFAULTS 111 
     113#define SWITCH_SPEAK 112 
     114#define SWITCH_STATS 113 
     115#define SWITCH_SUMMARY 114 
     116#define SWITCH_TABLES 115 
     117#define SWITCH_TAG 116 
     118#define SWITCH_TELEPORT 117 
     119#define SWITCH_TF 118 
     120#define SWITCH_THINGS 119 
     121#define SWITCH_TITLE 120 
     122#define SWITCH_TRACE 121 
     123#define SWITCH_UNCLEAR 122 
     124#define SWITCH_UNFOLDER 123 
     125#define SWITCH_UNGAG 124 
     126#define SWITCH_UNHIDE 125 
     127#define SWITCH_UNMUTE 126 
     128#define SWITCH_UNTAG 127 
     129#define SWITCH_UNTIL 128 
     130#define SWITCH_URGENT 129 
     131#define SWITCH_USEFLAG 130 
     132#define SWITCH_WHAT 131 
     133#define SWITCH_WHO 132 
     134#define SWITCH_WIPE 133 
     135#define SWITCH_WIZ 134 
     136#define SWITCH_WIZARD 135 
     137#define SWITCH_YES 136 
     138#define SWITCH_ZONE 137 

  • 1.7.7/hdrs/version.h

    r427 r429  
    1 #define VERSION "PennMUSH version 1.7.7 patchlevel 14 [05/22/2003]" 
    2 #define SHORTVN "PennMUSH 1.7.7p14" 
    3 #define NUMVERSION 001007007014 
     1#define VERSION "PennMUSH version 1.7.7 patchlevel 15 [06/01/2003]" 
     2#define SHORTVN "PennMUSH 1.7.7p15" 
     3#define NUMVERSION 001007007015 

  • 1.7.7/src/attrib.c

    r427 r429  
    3131#include "confmagic.h" 
    3232 
     33#ifdef WIN32 
     34#pragma warning( disable : 4761)    /* disable warning re conversion */ 
     35#endif 
     36 
     37 
    3338/** A string tree that temporarily stores matching attributes from current 
    3439 * and parent objects when we're searching for commands on attributes 
    …… 
    392397    return NULL; 
    393398 
     399  ancestor = Ancestor_Parent(thing); 
    394400  for (parent_depth = 0, temp = thing; 
    395401       parent_depth < MAX_PARENTS && temp != NOTHING; 
    …… 
    399405     */ 
    400406    if (temp == ancestor) 
    401       ancestor = -1; 
     407      ancestor = NOTHING; 
    402408    for (ptr = List(temp); ptr; ptr = AL_NEXT(ptr)) { 
    403409      comp = strcoll(atr, AL_NAME(ptr)); 
    …… 
    413419  } 
    414420  /* If we have a valid ancestor, search it as well */ 
    415   ancestor = Ancestor_Parent(thing); 
    416421  if (GoodObject(ancestor)) { 
    417422    for (parent_depth = 0, temp = ancestor; 
    …… 
    441446       parent_depth < MAX_PARENTS && temp != NOTHING; 
    442447       parent_depth++, temp = Parent(temp)) { 
    443     /* If the ancestor of the object is in its explict parent chain, 
    444      * we use it there, and don't check the ancestor later 
    445      */ 
    446     if (temp == ancestor) 
    447       ancestor = -1; 
    448448    for (ptr = List(temp); ptr; ptr = AL_NEXT(ptr)) { 
    449449      comp = strcoll(atr, AL_NAME(ptr)); 
    …… 
    10751075 * \return a pointer to the compressed data, in a static buffer. 
    10761076 */ 
    1077 unsigned char *const 
     1077unsigned char const * 
    10781078atr_get_compressed_data(ATTR *atr) 
    10791079{ 
    …… 
    10921092 * \return a pointer to the uncompressed data, in a static buffer. 
    10931093 */ 
    1094 char *const 
     1094char * 
    10951095atr_value(ATTR *atr) 
    10961096{ 

  • 1.7.7/src/bsd.c

    r427 r429  
    966966 
    967967static void 
    968 shovechars(Port_t port, Port_t sslport) 
     968shovechars(Port_t port, Port_t sslport __attribute__ ((__unused__))) 
    969969{ 
    970970  /* this is the main game loop */ 
    …… 
    32493249      strcpy(poll_msg, "Doing"); 
    32503250    if (ShowAnsi(call_by->player)) 
    3251       sprintf(tbuf2, "%s          %s   %s  %s%s\n", 
     3251      sprintf(tbuf2, "%-16s %10s %6s  %s%s\n", 
    32523252          T("Player Name"), T("On For"), T("Idle"), poll_msg, ANSI_NORMAL); 
    32533253    else 
    3254       sprintf(tbuf2, "%s          %s   %s  %s\n", 
     3254      sprintf(tbuf2, "%-16s %10s %6s  %s\n", 
    32553255          T("Player Name"), T("On For"), T("Idle"), poll_msg); 
    32563256    queue_string(call_by, tbuf2); 
    32573257  } else if (doing == 2) { 
    3258     sprintf(tbuf2, "%s      %s    %s  %s  %s Des  Sent    Recv  Pend\n", 
     3258    sprintf(tbuf2, "%-16s %6s %9s %5s %5s Des  Sent    Recv  Pend\n", 
    32593259        T("Player Name"), T("Loc #"), T("On For"), T("Idle"), T("Cmds")); 
    32603260    queue_string(call_by, tbuf2); 
    32613261  } else { 
    3262     sprintf(tbuf2, "%s       %s    %s  %s  %s Des  Host\n", 
     3262    sprintf(tbuf2, "%-16s %6s %9s %5s %5s Des  Host\n", 
    32633263        T("Player Name"), T("Loc #"), T("On For"), T("Idle"), T("Cmds")); 
    32643264    queue_string(call_by, tbuf2); 
    …… 
    32923292      } else if (call_by->connected && doing == 2 && call_by->player 
    32933293         && Priv_Who(call_by->player)) { 
    3294     sprintf(tbuf1, "%-16s %5s %9s %5s %5d %4d %5lu %7lu %5d", 
     3294    sprintf(tbuf1, "%-16s %6s %9s %5s %5d %3d %5lu %7lu %5d", 
    32953295        Name(d->player), unparse_dbref(Location(d->player)), 
    32963296        time_format_1(now - d->connected_at), 
    …… 
    39233923{ 
    39243924  /* returns a list of the network descriptors that a player is 
    3925    * connected to (wizard-only) 
     3925   * connected to  
    39263926   */ 
    39273927 
    …… 
    39293929  DESC *d; 
    39303930  int first; 
    3931   if (!Hasprivs(executor)) { 
     3931 
     3932  if (!Priv_Who(executor)) { 
    39323933    notify(executor, T("Permission denied.")); 
    39333934    return; 

  • 1.7.7/src/chunk.c

    r427 r429  
    224224#include <assert.h> 
    225225#include <sys/types.h> 
     226#ifdef WIN32 
     227#include <io.h> 
     228#else 
    226229#include <unistd.h> 
     230#endif 
    227231 
    228232#include "chunk.h" 
    …… 
    234238#include "mymalloc.h" 
    235239#include "confmagic.h" 
     240 
     241#ifdef WIN32 
     242#pragma warning( disable : 4761)    /* disable warning re conversion */ 
     243#endif 
    236244 
    237245/* A whole bunch of debugging #defines. */ 
    …… 
    529537 * When the deref counts get too big, the current period is incremented 
    530538 * and all derefs are divided by 2. */ 
    531 static u_int curr_period; 
     539static u_int_32 curr_period; 
    532540 
    533541/* 
    534542 * Info about all regions 
    535543 */ 
    536 static u_int region_count;    /**< regions in use */ 
    537 static u_int region_array_len;    /**< length of regions array */ 
     544static u_int_32 region_count; /**< regions in use */ 
     545static u_int_32 region_array_len; /**< length of regions array */ 
    538546static Region *regions;     /**< regions array, realloced as (rarely) needed */ 
    539547 
    …… 
    541549 * regions presently in memory 
    542550 */ 
    543 static u_int cached_region_count; /**< number of regions in cache */ 
     551static u_int_32 cached_region_count;  /**< number of regions in cache */ 
    544552static RegionHeader *cache_head;    /**< most recently used region */ 
    545553static RegionHeader *cache_tail;    /**< least recently used region */ 
    …… 
    581589static u_int_16 *m_length;  /**< The lengths of the chunks to be moved. */ 
    582590static u_int_16 *m_unhappiness; /**< The unhappiness of the chunks. */ 
    583 static u_char *m_derefs;  /**< The dereferences for the chunks. */ 
     591static unsigned char *m_derefs;   /**< The dereferences for the chunks. */ 
    584592static int m_limit;     /**< The number of migrates allowed. */ 
    585593 
    …… 
    15061514  chunk_reference_t *t_r; 
    15071515  u_int_16 t_l, t_u; 
    1508   u_char t_d; 
     1516  unsigned char t_d; 
    15091517 
    15101518  for (j = 1; j < m_count; j++) { 
    …… 
    20182026      notify(player, s); \ 
    20192027    else \ 
    2020       do_rawlog(LT_TRACE, s); \ 
     2028      do_rawlog(LT_TRACE, "%s", s); \ 
    20212029  } while (0) 
    20222030 
    …… 
    20882096 */ 
    20892097static void 
    2090 chunk_histogram(dbref player, int *histogram, char const *legend) 
     2098chunk_histogram(dbref player, int const *histogram, char const *legend) 
    20912099{ 
    20922100  const char *s; 
    …… 
    21462154    pen = j + strlen(num) + 1; 
    21472155      } else { 
    2148     if (j - strlen(num) < pen) 
     2156    if (j - (int) strlen(num) < pen) 
    21492157      ante = 18; 
    21502158    else 
    …… 
    21702178 * \return histogram data for the regions. 
    21712179 */ 
    2172 static int *const 
     2180static int const * 
    21732181chunk_regionhist(void) 
    21742182{ 
    …… 
    21872195 * \return histogram data for the free space. 
    21882196 */ 
    2189 static int *const 
     2197static int const * 
    21902198chunk_freehist(void) 
    21912199{ 

  • 1.7.7/src/flags.c

    r427 r429  
    709709/** Locate a specific bit within a byte given a bit position */ 
    710710#define FlagBit(x) (7 - (x % 8)) 
     711/** How many bytes do we need for a flag bitmask? */ 
     712#define FlagBytes  ((size_t)((flagbits + 7) / 8)) 
    711713 
    712714/** Allocate a new flag bitmask. 
    …… 
    720722{ 
    721723  object_flag_type bitmask; 
    722   int flagbytes = (flagbits + 7) / 8;   /* Rounds up to nearest byte */ 
    723   bitmask = (object_flag_type) mush_malloc(flagbytes, "flag_bitmask"); 
     724  bitmask = (object_flag_type) mush_malloc(FlagBytes, "flag_bitmask"); 
    724725  if (!bitmask) 
    725726    panic("Unable to allocate memory for flag bitmask"); 
    726   memset(bitmask, 0, flagbytes); 
     727  memset(bitmask, 0, FlagBytes); 
    727728  return bitmask; 
    728729} 
    …… 
    739740{ 
    740741  object_flag_type bitmask; 
    741   int flagbytes = 1 + flagbits / 8; 
    742   bitmask = (object_flag_type) mush_malloc(flagbytes, "flag_bitmask"); 
     742  bitmask = (object_flag_type) mush_malloc(FlagBytes, "flag_bitmask"); 
    743743  if (!bitmask) 
    744744    panic("Unable to allocate memory for flag bitmask"); 
    745   memcpy(bitmask, given, flagbytes); 
     745  memcpy(bitmask, given, FlagBytes); 
    746746  return bitmask; 
    747747} 
    …… 
    756756copy_flag_bitmask(object_flag_type dest, object_flag_type given) 
    757757{ 
    758   int flagbytes = 1 + flagbits / 8; 
    759   memcpy((void *) dest, (void *) given, flagbytes); 
     758  memcpy((void *) dest, (void *) given, FlagBytes); 
    760759} 
    761760 
    …… 
    837836  unsigned int i; 
    838837  int ok = 1; 
    839   unsigned int flagbytes = 1 + flagbits / 8; 
    840   for (i = 0; i < flagbytes; i++) 
     838  for (i = 0; i < FlagBytes; i++) 
    841839    ok &= ((*(bitmask + i) & *(source + i)) == *(bitmask + i)); 
    842840  return ok; 
    …… 
    853851  unsigned int i; 
    854852  int bad = 0; 
    855   unsigned int flagbytes = 1 + flagbits / 8; 
    856   for (i = 0; i < flagbytes; i++) 
     853  for (i = 0; i < FlagBytes; i++) 
    857854    bad |= *(source + i); 
    858855  return (!bad); 
    …… 
    872869  unsigned int i; 
    873870  int ok = 0; 
    874   unsigned int flagbytes = 1 + flagbits / 8; 
    875   for (i = 0; i < flagbytes; i++) 
     871  for (i = 0; i < FlagBytes; i++) 
    876872    ok |= (*(bitmask + i) & *(source + i)); 
    877873  return ok; 

  • 1.7.7/src/look.c

    r427 r429  
    4141static void look_atrs(dbref player, dbref thing, const char *mstr, int all); 
    4242static void look_simple(dbref player, dbref thing); 
    43 static void look_description(dbref player, dbref thing, char *def, 
     43static void look_description(dbref player, dbref thing, const char *def, 
    4444                 const char *descname, const char *descformatname); 
    4545static int decompile_helper 
    …… 
    483483 
    484484static void 
    485 look_description(dbref player, dbref thing, char *def, const char *descname, 
    486          const char *descformatname) 
     485look_description(dbref player, dbref thing, const char *def, 
     486         const char *descname, const char *descformatname) 
    487487{ 
    488488  /* Show thing's description to player, obeying DESCFORMAT if set */ 

  • 1.7.7/src/mysocket.c

    r427 r429  
    476476 */ 
    477477 
    478 static const char *inet_ntop4(const u_char * src, char *dst, size_t size); 
    479 static const char *inet_ntop6(const u_char * src, char *dst, size_t size); 
     478static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size); 
     479static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size); 
    480480 
    481481/* char * 
    …… 
    509509 * notes: 
    510510 *      (1) uses no statics 
    511  *      (2) takes a u_char* not an in_addr as input 
     511 *      (2) takes a unsigned char* not an in_addr as input 
    512512 * author: 
    513513 *      Paul Vixie, 1996. 
    514514 */ 
    515515static const char * 
    516 inet_ntop4(const u_char * src, char *dst, size_t size) 
     516inet_ntop4(const unsigned char *src, char *dst, size_t size) 
    517517{ 
    518518  static const char fmt[] = "%u.%u.%u.%u"; 
    …… 
    535535 */ 
    536536static const char * 
    537 inet_ntop6(const u_char * src, char *dst, size_t size) 
     537inet_ntop6(const unsigned char *src, char *dst, size_t size) 
    538538{ 
    539539  /* 
    …… 
    548548    int base, len; 
    549549  } best, cur; 
    550   u_int words[IN6ADDRSZ / INT16SZ]; 
     550  unsigned int words[IN6ADDRSZ / INT16SZ]; 
    551551  int i; 
    552552 
    …… 
    648648 */ 
    649649 
    650 static int inet_pton4(const char *src, u_char * dst); 
    651 static int inet_pton6(const char *src, u_char * dst); 
     650static int inet_pton4(const char *src, unsigned char *dst); 
     651static int inet_pton6(const char *src, unsigned char *dst); 
    652652 
    653653/* int 
    …… 
    688688 */ 
    689689static int 
    690 inet_pton4(const char *src, u_char * dst) 
     690inet_pton4(const char *src, unsigned char *dst) 
    691691{ 
    692692  static const char digits[] = "0123456789"; 
    693693  int saw_digit, octets, ch; 
    694   u_char tmp[INADDRSZ], *tp; 
     694  unsigned char tmp[INADDRSZ], *tp; 
    695695 
    696696  saw_digit = 0; 
    …… 
    701701 
    702702    if ((pch = strchr(digits, ch)) != NULL) { 
    703       u_int new = *tp * 10 + (pch - digits); 
     703      unsigned int new = *tp * 10 + (pch - digits); 
    704704 
    705705      if (new > 255) 
    …… 
    740740 */ 
    741741static int 
    742 inet_pton6(const char *src, u_char * dst) 
     742inet_pton6(const char *src, unsigned char *dst) 
    743743{ 
    744744  static const char xdigits_l[] = "0123456789abcdef", 
    745745    xdigits_u[] = "0123456789ABCDEF"; 
    746   u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp; 
     746  unsigned char tmp[IN6ADDRSZ], *tp, *endp, *colonp; 
    747747  const char *xdigits, *curtok; 
    748748  int ch, saw_xdigit; 
    749   u_int val; 
     749  unsigned int val; 
    750750 
    751751  memset((tp = tmp), 0, IN6ADDRSZ); 
    …… 
    782782      if (tp + INT16SZ > endp) 
    783783    return (0); 
    784       *tp++ = (u_char) (val >> 8) & 0xff; 
    785       *tp++ = (u_char) val & 0xff; 
     784      *tp++ = (unsigned char) (val >> 8) & 0xff; 
     785      *tp++ = (unsigned char) val & 0xff; 
    786786      saw_xdigit = 0; 
    787787      val = 0; 
    …… 
    798798    if (tp + INT16SZ > endp) 
    799799      return (0); 
    800     *tp++ = (u_char) (val >> 8) & 0xff; 
    801     *tp++ = (u_char) val & 0xff; 
     800    *tp++ = (unsigned char) (val >> 8) & 0xff; 
     801    *tp++ = (unsigned char) val & 0xff; 
    802802  } 
    803803  if (colonp != NULL) { 

  • 1.7.7/src/set.c

    r427 r429  
    357357   * this allows players to @chzone themselves to an object they own. 
    358358   */ 
    359   if (!Wizard(player) && !Owns(player, thing)) { 
     359  if (!(God(player) || (!God(thing) && Wizard(player)) || Owns(player, thing))) { 
    360360    if (noisy) 
    361361      notify(player, T("You don't have the power to shift reality.")); 
    …… 
    472472    ((*af->flag == NOT_TOKEN) && (af->f == AF_SAFE) && 
    473473     Can_Write_Attr_Ignore_Safe(player, thing, AL_ATTR(atr))))) { 
    474     notify_format(player, T("You cannot set %s/%s"), Name(thing), AL_NAME(atr)); 
    475     return 0; 
    476   } 
    477   if (*af->flag == NOT_TOKEN) 
     474    notify_format(player, T("You cannot change that flag on %s/%s"), 
     475          Name(thing), AL_NAME(atr)); 
     476    return 0; 
     477  } 
     478 
     479  if (*af->flag == NOT_TOKEN) { 
    478480    AL_FLAGS(atr) &= ~af->f; 
    479   else 
     481    if (!Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) 
     482      notify_format(player, T("%s/%s - %s reset."), Name(thing), AL_NAME(atr), 
     483            (af->flag + 1)); 
     484  } else { 
    480485    AL_FLAGS(atr) |= af->f; 
    481  
    482   if (!Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) 
    483     notify_format(player, "%s/%s - Set.", Name(thing), AL_NAME(atr)); 
     486    if (!Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) 
     487      notify_format(player, T("%s/%s - %s set."), Name(thing), AL_NAME(atr), 
     488            af->flag); 
     489  } 
    484490 
    485491  return 1; 

  • 1.7.7/src/switchinc.c

    r427 r429  
    4646  {"FOLDERS", SWITCH_FOLDERS}, 
    4747  {"FORWARD", SWITCH_FORWARD}, 
     48  {"FREESPACE", SWITCH_FREESPACE}, 
    4849  {"FSTATS", SWITCH_FSTATS}, 
    4950  {"FULL", SWITCH_FULL}, 
    …… 
    136137  {"YES", SWITCH_YES}, 
    137138  {"ZONE", SWITCH_ZONE}, 
    138   {NULL, 0} 
     139{NULL, 0} 
    139140}; 

  • 1.7.7/win32/funs.h

    r427 r429  
    319319FUNCTION_PROTO(fun_zfun); 
    320320FUNCTION_PROTO(fun_zone); 
    321 FUNCTION_PROTO(local_fun_silly);