PennMUSH Community

Changeset 1163

Show
Ignore:
Timestamp:
11/24/07 18:18:11 (10 months ago)
Author:
shawnw
Message:

#7492: Intrevis's win32 fix patch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/CHANGES.183

    r1162 r1163  
    4444   Suggested by Yuriko. 
    4545 * New hook power grants rights to use @hook. Suggested by Paige. 
     46 * Windows compile fixes by Intrevis. 
    4647 
    4748Commands: 

  • 1.8.3/branches/devel/confmagic.h

    r1136 r1163  
    1313#define _confmagic_h_ 
    1414 
    15  /* 
     15#define inline __inline 
     16 
     17/* 
    1618 * (which isn't exportable from the U.S.), then don't encrypt 
    1719 */ 

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

    r1159 r1163  
    5555 
    5656static int write_ansi_close(char *buff, char **bp); 
    57 static int write_ansi_letters(ansi_data cur, char *buff, char **bp); 
     57static int write_ansi_letters(const ansi_data *cur, char *buff, char **bp); 
    5858static int safe_markup(char const *a_tag, char *buf, char **bp, char type); 
    5959static int 
    …… 
    406406  retval += safe_chr(TAG_START, buff, bp); 
    407407  retval += safe_chr(MARKUP_COLOR, buff, bp); 
    408   retval += write_ansi_letters(*cur, buff, bp); 
     408  retval += write_ansi_letters(cur, buff, bp); 
    409409  retval += safe_chr(TAG_END, buff, bp); 
    410410  return retval; 
    …… 
    423423 
    424424static int 
    425 write_ansi_letters(const ansi_data cur, char *buff, char **bp) 
     425write_ansi_letters(const ansi_data *cur, char *buff, char **bp) 
    426426{ 
    427427  int retval = 0; 
    428428  char *save; 
    429429  save = *bp; 
    430   if (cur.fore == 'n') { 
    431     retval += safe_chr(cur.fore, buff, bp); 
     430  if (cur->fore == 'n') { 
     431    retval += safe_chr(cur->fore, buff, bp); 
    432432  } else { 
    433 #define CBIT_SET(x,y) (x.bits & y) 
     433#define CBIT_SET(x,y) (x->bits & y) 
    434434    if (CBIT_SET(cur, CBIT_FLASH)) 
    435435      retval += safe_chr('f', buff, bp); 
    …… 
    441441      retval += safe_chr('u', buff, bp); 
    442442#undef CBIT_SET 
    443 #define CBIT_SET(x,y) (x.offbits & y) 
     443#define CBIT_SET(x,y) (x->offbits & y) 
    444444    if (CBIT_SET(cur, CBIT_FLASH)) 
    445445      retval += safe_chr('F', buff, bp); 
    …… 
    452452#undef CBIT_SET 
    453453 
    454     if (cur.fore) 
    455       retval += safe_chr(cur.fore, buff, bp); 
    456     if (cur.back) 
    457       retval += safe_chr(cur.back, buff, bp); 
     454    if (cur->fore) 
     455      retval += safe_chr(cur->fore, buff, bp); 
     456    if (cur->back) 
     457      retval += safe_chr(cur->back, buff, bp); 
    458458  } 
    459459 
    …… 
    769769 
    770770  ansi_data ansistack[BUFFER_LEN]; 
    771   ansistack[0] = ansi_null; 
    772771  int stacktop = 0; 
    773772 
    …… 
    775774  int oldcodes = 0; 
    776775 
     776  ansistack[0] = ansi_null; 
    777777 
    778778  if (!source) 
    …… 
    10281028{ 
    10291029  int i, j; 
     1030  int target = -1; 
     1031  int len = 0; 
    10301032 
    10311033  if (!as) 
    …… 
    10661068  } 
    10671069  /* end if_optimized */ 
    1068   int target = -1; 
    1069   int len = 0; 
    10701070  j = 0; 
    10711071 
    …… 
    12601260  markup_information *dm, *sm; 
    12611261 
     1262  ansi_data backansi; 
     1263 
     1264 
    12621265  /* If src->len == 0, we might have only markup. Stand-alones. Ew! */ 
    12631266  if (src->len <= 0 && src->nmarkups <= 0) 
    …… 
    13351338   * This sets backansi to any ansi values (bits, colors) that 
    13361339   * are continuous across an entire length of text. */ 
    1337   ansi_data backansi = ansi_null; 
     1340  backansi = ansi_null; 
    13381341  if (0 < loc && loc < dst->len) { 
    13391342    backansi.offbits = dst->ansi[loc - 1].offbits & dst->ansi[loc].offbits; 
    …… 
    13931396  int diff; 
    13941397  int retval = 0; 
     1398  ansi_data backansi; 
    13951399  markup_information *dm, *sm; 
    13961400 
    …… 
    15151519   * are continuous across an entire length of text. 
    15161520   */ 
    1517   ansi_data backansi = dst->ansi[loc]; 
     1521  backansi = dst->ansi[loc]; 
    15181522  for (i = loc; i < end && !ansi_isnull(backansi); i++) { 
    15191523    backansi.offbits &= dst->ansi[i].offbits; 
    …… 
    19121916 
    19131917  ansi_data ansistack[BUFFER_LEN]; 
    1914   ansistack[0] = ansi_null; 
    19151918  ansi_data oldansi; 
    19161919  ansi_data tmpansi; 
    …… 
    19251928 
    19261929  int retval = 0; 
     1930 
     1931  ansistack[0] = ansi_null; 
    19271932 
    19281933  if (!str || !*str) 
    …… 
    20752080      if (!ansi_isnull(tmpansi) && !ansi_equal(oldansi, tmpansi)) { 
    20762081        retval += safe_str("[ansi(", buff, bp); 
    2077         retval += write_ansi_letters(tmpansi, buff, bp); 
     2082        retval += write_ansi_letters(&tmpansi, buff, bp); 
    20782083        retval += safe_chr(',', buff, bp); 
    20792084        howmanyopen++; 

  • 1.8.3/branches/devel/win32/cmds.h

    r557 r1163  
    7575COMMAND_PROTO(cmd_malias); 
    7676COMMAND_PROTO(cmd_map); 
     77COMMAND_PROTO(cmd_message); 
    7778COMMAND_PROTO(cmd_motd); 
    7879COMMAND_PROTO(cmd_mvattr); 

  • 1.8.3/branches/devel/win32/confmagic.h

    r978 r1163  
    1313#define _confmagic_h_ 
    1414 
    15  /* 
     15#define inline __inline 
     16 
     17/* 
    1618 * (which isn't exportable from the U.S.), then don't encrypt 
    1719 */ 

  • 1.8.3/branches/devel/win32/funs.h

    r1037 r1163  
    200200FUNCTION_PROTO(fun_member); 
    201201FUNCTION_PROTO(fun_merge); 
     202FUNCTION_PROTO(fun_message); 
    202203FUNCTION_PROTO(fun_mid); 
    203204FUNCTION_PROTO(fun_min);