PennMUSH Community

Changeset 489

Show
Ignore:
Timestamp:
08/16/06 02:18:14 (2 years ago)
Author:
pennmush
Message:

PennMUSH 1.8.0p3 Archival

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.0/CHANGES.180

    r487 r489  
    1212 
    1313========================================================================== 
     14 
     15Version 1.8.0 patchlevel 3                      February 26, 2005 
     16 
     17Fixes: 
     18  * 1.8.0p2 fixed ""hi when chat_strip_quote was on, and broke it 
     19    when it was off. Fixed both ways now. Report by Cheetah@M*U*S*H. 
     20  * The @break fix in 1.8.0p2 stopped compound break actions 
     21    in {}'s from working correctly. Fixed now. Report by  
     22    Kevin@M*U*S*H. [TAP] 
     23  * @list/list() works right with flags/powers now. 
     24  * MS VS.NET project file now includes sql.c/h and bufferq.c/h. 
     25    Report by T'orA@M*U*S*H. 
     26  * playermem() and objectmem() now return #-1 NO MATCH consistently 
     27    when they can't match their argument to an object of an appropriate 
     28    type. Suggested by Cheetah@M*U*S*H. 
     29 
    1430 
    1531Version 1.8.0 patchlevel 2                      February 2, 2005 

  • 1.8.0/Patchlevel

    r487 r489  
    11Do not edit this file. It is maintained by the official PennMUSH patches. 
    2 This is PennMUSH 1.8.0p2 
     2This is PennMUSH 1.8.0p3 

  • 1.8.0/game/txt/hlp/pennv180.hlp

    r487 r489  
    1 & 1.8.0p2 
     1& 1.8.0p3 
    22& changes 
    33This is a list of changes in this patchlevel which are probably of 
    …… 
    1212be read in 'help patchlevels'. 
    1313 
     14Version 1.8.0 patchlevel 3                      February 26, 2005 
     15 
     16Fixes: 
     17  * 1.8.0p2 fixed ""hi when chat_strip_quote was on, and broke it 
     18    when it was off. Fixed both ways now. Report by Cheetah@M*U*S*H. 
     19  * The @break fix in 1.8.0p2 stopped compound break actions 
     20    in {}'s from working correctly. Fixed now. Report by  
     21    Kevin@M*U*S*H. [TAP] 
     22  * @list/list() works right with flags/powers now. 
     23  * MS VS.NET project file now includes sql.c/h and bufferq.c/h. 
     24    Report by T'orA@M*U*S*H. 
     25  * playermem() and objectmem() now return #-1 NO MATCH consistently 
     26    when they can't match their argument to an object of an appropriate 
     27    type. Suggested by Cheetah@M*U*S*H. 
     28 
     29 
     30& 1.8.0p2 
    1431Version 1.8.0 patchlevel 2                      February 2, 2005 
    1532 

  • 1.8.0/game/txt/hlp/pennvOLD.hlp

    r487 r489  
    44184418type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3' 
    44194419 
    4420 1.8.0: 0, 1, 2 
     44201.8.0: 0, 1, 2, 3 
    442144211.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 
    44224422       19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 

  • 1.8.0/hdrs/parse.h

    r477 r489  
    189189 * PE_STRIP_BRACES strips off top-level braces. 
    190190 * 
     191 * PE_COMMAND_BRACES strips off only completely enclosing braces, 
     192 * suitable for trimming command lists given to noparse commands like 
     193 * @switch or @break. 
     194 * 
    191195 * PE_EVALUATE allows %-substitutions, []-evaluation, function evaluation, 
    192196 * and \-stripping. 

  • 1.8.0/hdrs/version.h

    r487 r489  
    11#define VERSION "1.8.0" 
    2 #define PATCHLEVEL "2" 
    3 #define PATCHDATE "[02/02/2005]" 
    4 #define NUMVERSION 001008000002 
     2#define PATCHLEVEL "3" 
     3#define PATCHDATE "[02/26/2005]" 
     4#define NUMVERSION 001008000003 

  • 1.8.0/src/cmds.c

    r477 r489  
    9696  if (parse_boolean(arg_left)) { 
    9797    global_eval_context.break_called = 1; 
    98     if (arg_right && *arg_right) 
    99       strcpy(global_eval_context.break_replace, arg_right); 
     98    if (arg_right && *arg_right) { 
     99      char const *sp = arg_right; 
     100      char *bp = global_eval_context.break_replace; 
     101      process_expression(global_eval_context.break_replace, &bp, &sp, 
     102             player, player, cause, 
     103             PE_COMMAND_BRACES, PT_DEFAULT, NULL); 
     104      *bp++ = '\0'; 
     105    } 
    100106  } 
    101107} 
    …… 
    104110  if (!parse_boolean(arg_left)) { 
    105111    global_eval_context.break_called = 1; 
    106     if (arg_right && *arg_right) 
    107       strcpy(global_eval_context.break_replace, arg_right); 
     112    if (arg_right && *arg_right) { 
     113      char const *sp = arg_right; 
     114      char *bp = global_eval_context.break_replace; 
     115      process_expression(global_eval_context.break_replace, &bp, &sp, 
     116             player, player, cause, 
     117             PE_COMMAND_BRACES, PT_DEFAULT, NULL); 
     118      *bp++ = '\0'; 
     119    } 
    108120  } 
    109121} 

  • 1.8.0/src/command.c

    r487 r489  
    899899  case SAY_TOKEN: 
    900900    replacer = "SAY"; 
    901     p--;            /* Since 'say' strips out the '"' */ 
     901    if (CHAT_STRIP_QUOTE) 
     902      p--;          /* Since 'say' strips out the '"' */ 
    902903    break; 
    903904  case POSE_TOKEN: 

  • 1.8.0/src/funmisc.c

    r469 r489  
    578578  else if (string_prefix("attribs", args[0])) 
    579579    safe_str(list_attribs(), buff, bp); 
     580  else if (string_prefix("flags", args[0])) 
     581    safe_str(list_all_flags("FLAG", "", executor, 0x3), buff, bp); 
     582  else if (string_prefix("powers", args[0])) 
     583    safe_str(list_all_flags("POWER", "", executor, 0x3), buff, bp); 
    580584  else 
    581585    safe_str("#-1", buff, bp); 
    …… 
    589593  char save_ccom[BUFFER_LEN]; 
    590594  char *cmdptr; 
    591  
    592595  if (nargs == 1) { 
    593596    thing = executor; 
    …… 
    616619enum whichof_t { DO_FIRSTOF, DO_ALLOF }; 
    617620static void 
    618 do_whichof(char *args[], int nargs, enum whichof_t flag, char *buff, char **bp, 
    619        dbref executor, dbref caller, dbref enactor, PE_Info * pe_info) 
     621do_whichof(char *args[], int nargs, enum whichof_t flag, 
     622       char *buff, char **bp, dbref executor, 
     623       dbref caller, dbref enactor, PE_Info * pe_info) 
    620624{ 
    621625  int j; 
    …… 
    624628  char sep = ' '; 
    625629  int first = 1; 
    626  
    627630  tbuf[0] = '\0'; 
    628  
    629631  if (flag == DO_ALLOF) { 
    630632    /* The last arg is a delimiter. Parse it in place. */ 
    …… 
    632634    char *isep = insep; 
    633635    const char *arglast = args[nargs - 1]; 
    634     process_expression(insep, &isep, &arglast, executor, caller, enactor, 
    635                PE_DEFAULT, PT_DEFAULT, pe_info); 
     636    process_expression(insep, &isep, &arglast, executor, 
     637               caller, enactor, PE_DEFAULT, PT_DEFAULT, pe_info); 
    636638    *isep = '\0'; 
    637639    strcpy(args[nargs - 1], insep); 
    638  
    639640    if (!delim_check(buff, bp, nargs, args, nargs, &sep)) 
    640641      return; 
    …… 
    645646    tp = tbuf; 
    646647    sp = args[j]; 
    647     process_expression(tbuf, &tp, &sp, executor, caller, enactor, 
    648                PE_DEFAULT, PT_DEFAULT, pe_info); 
     648    process_expression(tbuf, &tp, &sp, executor, caller, 
     649               enactor, PE_DEFAULT, PT_DEFAULT, pe_info); 
    649650    *tp = '\0'; 
    650651    if (parse_boolean(tbuf)) { 
    …… 
    653654      } else 
    654655    first = 0; 
    655  
    656656      safe_str(tbuf, buff, bp); 
    657  
    658657      if (flag == DO_FIRSTOF) 
    659658    return; 
    …… 
    667666FUNCTION(fun_firstof) 
    668667{ 
    669   do_whichof(args, nargs, DO_FIRSTOF, buff, bp, executor, caller, enactor, 
    670          pe_info); 
     668  do_whichof(args, nargs, DO_FIRSTOF, buff, bp, executor, 
     669         caller, enactor, pe_info); 
    671670} 
    672671 
    …… 
    675674FUNCTION(fun_allof) 
    676675{ 
    677   do_whichof(args, nargs, DO_ALLOF, buff, bp, executor, caller, enactor, 
    678          pe_info); 
    679 } 
     676  do_whichof(args, nargs, DO_ALLOF, buff, bp, executor, 
     677         caller, enactor, pe_info); 
     678} 

  • 1.8.0/src/game.c

    r487 r489  
    22292229  else if (string_prefix("attribs", arg)) 
    22302230    do_list_attribs(player, lc); 
     2231  else if (string_prefix("flags", arg)) 
     2232    do_list_flags("FLAG", player, "", lc, T("Flags")); 
     2233  else if (string_prefix("powers", arg)) 
     2234    do_list_flags("POWERS", player, "", lc, T("Powers")); 
    22312235  else 
    22322236    notify(player, T("I don't understand what you want to @list.")); 

  • 1.8.0/src/wiz.c

    r483 r489  
    19501950    thing = noisy_match_result(executor, args[0], NOTYPE, MAT_OBJECTS); 
    19511951  } 
    1952  
    1953   if (!GoodObject(thing) || !Can_Examine(executor, thing)) { 
     1952  if (!GoodObject(thing)) { 
     1953    safe_str(T(e_match), buff, bp); 
     1954    return; 
     1955  } 
     1956  if (!Can_Examine(executor, thing)) { 
    19541957    safe_str(T(e_perm), buff, bp); 
    19551958    return; 
    …… 
    19791982  else 
    19801983    thing = lookup_player(args[0]); 
    1981   if (!GoodObject(thing) || !Can_Examine(executor, thing)) { 
     1984  if (!GoodObject(thing) || !IsPlayer(thing)) { 
     1985    safe_str(T(e_match), buff, bp); 
     1986    return; 
     1987  } 
     1988  if (!Can_Examine(executor, thing)) { 
    19821989    safe_str(T(e_perm), buff, bp); 
    19831990    return; 

  • 1.8.0/win32/msvc.net/pennmush.vcproj

    r479 r489  
    140140            </File> 
    141141            <File 
     142                RelativePath=".\src\sql.c"> 
     143            </File> 
     144            <File 
     145                RelativePath=".\src\bufferq.c"> 
     146            </File> 
     147            <File 
    142148                RelativePath=".\src\cmdlocal.c"> 
    143149            </File> 
    …… 
    352358            <File 
    353359                RelativePath="hdrs\boolexp.h"> 
     360            </File> 
     361            <File 
     362                RelativePath="hdrs\sql.h"> 
     363            </File> 
     364            <File 
     365                RelativePath="hdrs\bufferq.h"> 
    354366            </File> 
    355367            <File