Gammon Forum

Common subdirectories: src/CVS and src.new/CVS
diff -c src/act_info.c src.new/act_info.c
*** src/act_info.c	Mon Apr 19 10:33:56 1999
--- src.new/act_info.c	Wed Mar 10 07:36:06 2004
***************
*** 3975,3989 ****
  
      if ( !IS_NPC(ch) && IS_SET(ch->comm, COMM_NOGOSSIP))
      {
! 	send_to_char("But you have the gossip channel turned
! off!\n\r",ch);
  	return;
      }
  
      if ( !IS_NPC(ch) && IS_SET(ch->comm, COMM_NOCHANNELS))
      {
! 	send_to_char("The gods have revoked your channel
! priviliges.\n\r",ch);
  	return;
      }
  
--- 3975,3987 ----
  
      if ( !IS_NPC(ch) && IS_SET(ch->comm, COMM_NOGOSSIP))
      {
! 	send_to_char("But you have the gossip channel turned off!\n\r",ch);
  	return;
      }
  
      if ( !IS_NPC(ch) && IS_SET(ch->comm, COMM_NOCHANNELS))
      {
! 	send_to_char("The gods have revoked your channel priviliges.\n\r",ch);
  	return;
      }
  
diff -c src/act_wiz.c src.new/act_wiz.c
*** src/act_wiz.c	Wed Apr 14 10:56:46 1999
--- src.new/act_wiz.c	Wed Mar 10 07:40:01 2004
***************
*** 844,850 ****
  			char_puts("You are too pumped to pray now.\n", ch);
  			return;
  		}
! #ifdef 0
  		if (!IS_SET(ch->in_room->room_flags, ROOM_PEACE)) {
  			char_puts("You must be in a safe place in order "
  				  "to make a transportation.\n", ch);
--- 844,850 ----
  			char_puts("You are too pumped to pray now.\n", ch);
  			return;
  		}
! #if 0
  		if (!IS_SET(ch->in_room->room_flags, ROOM_PEACE)) {
  			char_puts("You must be in a safe place in order "
  				  "to make a transportation.\n", ch);
***************
*** 2963,2972 ****
  break;
                case CON_PICK_WEAPON:			 st = " Weapon ";
  break;
! 			  case CON_READ_IMOTD:			 st = "
! IMOTD  "; 	break;
! 			  case CON_BREAK_CONNECT:		 st =
! "LINKDEAD";	break;
                case CON_READ_MOTD:            st = "  MOTD  ";    break;
                default:                       st = "UNKNOWN!";    break;
             }           count++;           
--- 2963,2970 ----
  break;
                case CON_PICK_WEAPON:			 st = " Weapon ";
  break;
! 			  case CON_READ_IMOTD:			 st = " IMOTD  "; 	break;
! 			  case CON_BREAK_CONNECT:		 st = "LINKDEAD";	break;
                case CON_READ_MOTD:            st = "  MOTD  ";    break;
                default:                       st = "UNKNOWN!";    break;
             }           count++;           
Common subdirectories: src/comm and src.new/comm
Common subdirectories: src/compat and src.new/compat
Common subdirectories: src/db and src.new/db
diff -c src/db.c src.new/db.c
*** src/db.c	Sun Apr  4 11:15:19 1999
--- src.new/db.c	Wed Mar 10 07:43:37 2004
***************
*** 84,91 ****
  	int getpid();
  	time_t time(time_t *tloc);
  #elif defined(LINUX)
! 	long random();
! 	void srandom(unsigned int);
  	int getpid();
  	time_t time(time_t *tloc);
  #endif
--- 84,91 ----
  	int getpid();
  	time_t time(time_t *tloc);
  #elif defined(LINUX)
! //	long random(void);
! //	void srandom(unsigned int);
  	int getpid();
  	time_t time(time_t *tloc);
  #endif
diff -c src/merc.h src.new/merc.h
*** src/merc.h	Thu Apr 15 13:23:36 1999
--- src.new/merc.h	Wed Mar 10 07:41:05 2004
***************
*** 46,52 ****
  #if	defined (LINUX) || defined (WIN32)
  #	undef  NOCRYPT
  #	define NOCRYPT
! #	pragma warning (disable : 4244 4018 4761)
  #endif
  
  #include <limits.h>
--- 46,52 ----
  #if	defined (LINUX) || defined (WIN32)
  #	undef  NOCRYPT
  #	define NOCRYPT
! //#	pragma warning (disable : 4244 4018 4761)
  #endif
  
  #include <limits.h>
Only in src.new: muddy.exe
Common subdirectories: src/mudprogs and src.new/mudprogs
Common subdirectories: src/olc and src.new/olc
diff -c src/str.c src.new/str.c
*** src/str.c	Thu Nov 26 02:17:46 1998
--- src.new/str.c	Wed Mar 10 07:40:41 2004
***************
*** 249,255 ****
  	return dest;
  }
  
! char *strlwr(const char *s)
  {
  	static char buf[MAX_STRING_LENGTH];
  	char *p;
--- 249,255 ----
  	return dest;
  }
  
! char *strlwr(char *s)
  {
  	static char buf[MAX_STRING_LENGTH];
  	char *p;
diff -c src/str.h src.new/str.h
*** src/str.h	Mon Nov  2 16:28:31 1998
--- src.new/str.h	Wed Mar 10 07:35:08 2004
***************
*** 40,46 ****
  char *	strnzcat(char *dest, const char *src, size_t);
  char *	strnzncat(char *dest, const char *src, size_t len, size_t count);
  #if !defined (WIN32)
! char *	strlwr(const char *s);
  #endif
  
  int	str_cmp		(const char *astr, const char *bstr);
--- 40,46 ----
  char *	strnzcat(char *dest, const char *src, size_t);
  char *	strnzncat(char *dest, const char *src, size_t len, size_t count);
  #if !defined (WIN32)
! char *	strlwr(char *s);
  #endif
  
  int	str_cmp		(const char *astr, const char *bstr);

$ patch < ../fixups.diff
patching file act_info.c
patching file act_wiz.c
patching file db.c
patching file merc.h
patching file str.c
patching file str.h