PennMUSH Community

Changeset 1177

Show
Ignore:
Timestamp:
12/31/07 23:15:22 (9 months ago)
Author:
shawnw
Message:

Update from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/CHANGES.182

    r1127 r1177  
    1414========================================================================== 
    1515 
    16 Version 1.8.2 patchlevel 8                     ??? ??, 200? 
     16Version 1.8.2 patchlevel 8                     Jan 01, 2008 
    1717 
    1818Minor changes: 
    …… 
    2222 * width() and height() do not return 0 when set to invalid input. 
    2323   By Talvo. 
     24 * Array underflow bug found by running under Valgrind. 
     25 * Crash bug when too many objects are nested. Reported by Paige, fixed 
     26   by Javelin and Intervis. 
    2427 
    2528Version 1.8.2 patchlevel 7                     October 6, 2007 
    …… 
    3538  * The open database file wasn't getting closed on a failed save. 
    3639  * Crash bug in sortkey(). Fix by Nathan Baum. 
     40  * Crash bug in pathological container cases reported by Paige@M*U*S*H 
     41    fixed by Javelin. 
    3742  * 'help @desc' brings up @describe instead of @descformat. 
    3843    Suggested by Nymeria. 

  • 1.8.3/branches/devel/game/txt/hlp/pennv182.hlp

    r1166 r1177  
    11& 1.8.2p8 
    2 Version 1.8.2 patchlevel 8                     ??? ??, 200? 
     2Version 1.8.2 patchlevel 8                     Jan 01, 2008 
    33 
    44Minor changes: 
    …… 
    88 * width() and height() do not return 0 when set to invalid input. 
    99   By Talvo. 
     10 * Array underflow bug found by running under Valgrind. 
     11 * Crash bug when too many objects are nested. Reported by Paige, fixed 
     12   by Javelin and Intervis. 
    1013 
    1114& 1.8.2p7 
    …… 
    2225  * The open database file wasn't getting closed on a failed save. 
    2326  * Crash bug in sortkey(). Fix by Nathan Baum. 
     27  * Crash bug in pathological container cases reported by Paige@M*U*S*H 
     28    fixed by Javelin. 
    2429  * 'help @desc' brings up @describe instead of @descformat. 
    2530    Suggested by Nymeria. 

  • 1.8.3/branches/devel/src/command.c

    r1162 r1177  
    445445  } else { 
    446446    size_t len = strlen(sw); 
     447    if (!cmd->sw.mask) 
     448      return 0; 
    447449    sw_val = dyn_switch_list; 
    448450    while (sw_val->name) { 

  • 1.8.3/branches/devel/src/funmath.c

    r1165 r1177  
    11301130    if (!is_number(args[1])) { 
    11311131      if (args[1][0] == 'e' && args[1][1] == '\0') 
    1132    base_is_e = true; 
     1132        base_is_e = true; 
    11331133      else { 
    1134    safe_str(T(e_nums), buff, bp); 
    1135    return; 
     1134        safe_str(T(e_nums), buff, bp); 
     1135        return; 
    11361136      } 
    1137     } else  
     1137    } else 
    11381138      base = parse_number(args[1]); 
    11391139 

  • 1.8.3/branches/devel/src/ssl_slave.c

    r905 r1177  
    218218 parse_arguments(int argc, char **argv, char *elog, char *mhost, 
    219219                 Port_t *mport, Port_t *lport, char *kfile, char *cafl); 
    220 static void logout_sock(CDESC *d); 
    221 static void shutdownsock(CDESC *d); 
     220static void logout_sock(CDESC * d); 
     221static void shutdownsock(CDESC * d); 
    222222static CDESC *initializesock(int s, char *addr, char *ip, int use_ssl); 
    223 int process_output(CDESC *d); 
    224 static int process_input(CDESC *d, int output_ready); 
    225 static void process_input_helper(CDESC *d, char *tbuf1, int got); 
     223int process_output(CDESC * d); 
     224static int process_input(CDESC * d, int output_ready); 
     225static void process_input_helper(CDESC * d, char *tbuf1, int got); 
    226226static void close_sockets(void); 
    227227static CDESC *connect_to_mush(const char *mush_host, Port_t mport); 
    …… 
    229229static int test_connection(int newsock); 
    230230static CDESC *new_connection(int oldsock, int *result, int use_ssl); 
    231 static int queue_newwrite(CDESC *d, const unsigned char *b, int n); 
    232 static int send_text(CDESC *d, const unsigned char *b); 
    233 static int send_concentor_command(CDESC *d, const unsigned char *b); 
    234 static int send_concentor_text(CDESC *d, int player_id, const unsigned char *b); 
     231static int queue_newwrite(CDESC * d, const unsigned char *b, int n); 
     232static int send_text(CDESC * d, const unsigned char *b); 
     233static int send_concentor_command(CDESC * d, const unsigned char *b); 
     234static int send_concentor_text(CDESC * d, int player_id, 
     235                               const unsigned char *b); 
    235236static void process_commands(void); 
    236237 
    …… 
    407408/* Send text to the MUSH from a player */ 
    408409static int 
    409 send_concentor_message(CDESC *d, int player_id, const unsigned char *b) 
     410send_concentor_message(CDESC * d, int player_id, const unsigned char *b) 
    410411{ 
    411412  unsigned char *message = 
    …… 
    417418/* Send text with a player_id of -1 */ 
    418419static int 
    419 send_concentor_command(CDESC *d, const unsigned char *b) 
     420send_concentor_command(CDESC * d, const unsigned char *b) 
    420421{ 
    421422  return send_concentrator_message(d, -1, b); 
    …… 
    529530 
    530531static void 
    531 queue_to_player(CDESC *d) 
     532queue_to_player(CDESC * d) 
    532533{ 
    533534  /* Parse a concentrator message from the MUSH in text blocks on 
    …… 
    538539 
    539540static void 
    540 queue_to_mush(CDESC *d) 
     541queue_to_mush(CDESC * d) 
    541542{ 
    542543  /* Parse some text from a player and queue it to the MUSH as 
    …… 
    633634 */ 
    634635static void 
    635 shutdownsock(CDESC *d) 
     636shutdownsock(CDESC * d) 
    636637{ 
    637638 
    …… 
    721722 */ 
    722723int 
    723 process_output(CDESC *d) 
     724process_output(CDESC * d) 
    724725{ 
    725726  struct text_block **qp, *cur; 
    …… 
    814815 
    815816static void 
    816 save_command(CDESC *d, const unsigned char *command) 
     817save_command(CDESC * d, const unsigned char *command) 
    817818{ 
    818819  add_to_queue(&d->input, command, u_strlen(command) + 1); 
    …… 
    821822 
    822823static void 
    823 process_input_helper(CDESC *d, char *tbuf1, int got) 
     824process_input_helper(CDESC * d, char *tbuf1, int got) 
    824825{ 
    825826  unsigned char *p, *pend, *q, *qend; 
    …… 
    870871/* ARGSUSED */ 
    871872static int 
    872 process_input(CDESC *d, int output_ready) 
     873process_input(CDESC * d, int output_ready) 
    873874{ 
    874875  int got = 0; 
    …… 
    10521053 
    10531054static int 
    1054 send_text(CDESC *d, const unsigned char *b) 
     1055send_text(CDESC * d, const unsigned char *b) 
    10551056{ 
    10561057  int l = u_strlen(b); 
    …… 
    10651066 */ 
    10661067static int 
    1067 queue_newwrite(CDESC *d, const unsigned char *b, int n) 
     1068queue_newwrite(CDESC * d, const unsigned char *b, int n) 
    10681069{ 
    10691070  int space;