diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/act_comm.c Alsherok/src/act_comm.c
--- afkmud/src/act_comm.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/act_comm.c	2003-05-29 02:13:57.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/act_info.c Alsherok/src/act_info.c
--- afkmud/src/act_info.c	2003-05-07 12:03:06.000000000 -0700
+++ Alsherok/src/act_info.c	2003-05-29 02:13:57.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -23,10 +25,10 @@
 #include <string.h>
 #include <ctype.h>
 #include <sys/stat.h>
-#ifdef FREEBSD
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <unistd.h>
 #endif
-#ifdef WINDOZE
+#if defined(__CYGWIN__)
 #include <crypt.h>
 #endif
 #include "mud.h"
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/act_move.c Alsherok/src/act_move.c
--- afkmud/src/act_move.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/act_move.c	2003-05-29 02:13:58.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/act_obj.c Alsherok/src/act_obj.c
--- afkmud/src/act_obj.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/act_obj.c	2003-05-29 02:13:58.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/act_wiz.c Alsherok/src/act_wiz.c
--- afkmud/src/act_wiz.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/act_wiz.c	2003-05-29 02:13:58.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -25,7 +27,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#ifdef WINDOZE
+#if defined(__CYGWIN__)
 #include <crypt.h>
 #endif
 #include "mud.h"
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/afk.c Alsherok/src/afk.c
--- afkmud/src/afk.c	2003-05-14 10:17:29.000000000 -0700
+++ Alsherok/src/afk.c	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -30,7 +32,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <fnmatch.h>
-#ifdef WINDOZE
+#if defined(__CYGWIN__)
 #include <crypt.h>
 #endif
 #include "mud.h"
@@ -289,7 +291,7 @@
 	   fprintf( fp, "%s", "#CACHE\n" );
 	   fprintf( fp, "IP		%s~\n",	cache->ip );
 	   fprintf( fp, "Name		%s~\n",	cache->name );
-	   fprintf( fp, "Time		%ld\n",	cache->time );
+	   fprintf( fp, "Time		%ld\n",	(long int)cache->time );
 	   fprintf( fp, "%s", "End\n\n" );
 	}
 	fprintf( fp, "%s", "#END\n" );
@@ -469,10 +471,10 @@
       for( i = 2; i < 255; ++i ) close(i);
 
 	sprintf( str_ip, "%ld", ip );
-#ifdef WINDOZE
-        execl( "../src/resolver.exe", "AFKMud Resolver", str_ip, NULL );
+#if defined(__CYGWIN__)
+        execl( "../src/resolver.exe", "AFKMud Resolver", str_ip, (char *)NULL );
 #else
-    	execl( "../src/resolver", "AFKMud Resolver", str_ip, NULL );
+    	execl( "../src/resolver", "AFKMud Resolver", str_ip, (char *)NULL );
 #endif
     	/* Still here --> hmm. An error. */
     	bug( "%s", "resolve_dns: Exec failed; Closing child." );
@@ -3517,7 +3519,7 @@
 	fprintf( fp, "Mday	%d\n", time_info.day	);
 	fprintf( fp, "Mmonth	%d\n", time_info.month	);
 	fprintf( fp, "Myear	%d\n", time_info.year	);
-      fprintf( fp, "Purgetime %ld\n", new_pfile_time_t   );
+      fprintf( fp, "Purgetime %ld\n", (long int)new_pfile_time_t   );
       fprintf( fp, "%s", "End\n\n" );
       fprintf( fp, "%s", "#END\n" );
     }
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/alias.h Alsherok/src/alias.h
--- afkmud/src/alias.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/alias.h	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/archery.c Alsherok/src/archery.c
--- afkmud/src/archery.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/archery.c	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/areaconvert.c Alsherok/src/areaconvert.c
--- afkmud/src/areaconvert.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/areaconvert.c	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -384,7 +386,7 @@
    while( aflags[0] != '\0' )
    {
 	aflags = one_argument( aflags, flag );
-	value = get_areaflag( flag );
+	value = get_aflag( flag );
 	if( value == -1 )
 	   bug( "Bad area flag: %s", flag );
 	else
@@ -687,14 +689,14 @@
 	   {
 		char *srace, *sclass;
 
-		   if( x1 >= 0 && x1 < 90 )
+		   if( x1 > 0 && x1 < 90 )
 		   srace = stock_race[x1];
 		else
 		   srace = "human";
 		
 	      pMobIndex->race		= get_npc_race( srace );
 
-		   if( x2 >= 0 && x2 < 25 )
+		   if( x2 > 0 && x2 < 25 )
 		   sclass = stock_class[x2];
 		else
 		   sclass = "warrior";
@@ -1812,7 +1813,7 @@
 	switch ( letter = fread_letter( fp ) )
 	{
 	default:
-	      bug( "Load_stspecials: letter '%c' not *MORS.", letter );
+	      bug( "Load_specials: letter '%c' not *MORS.", letter );
 	    exit( 1 );
 
 	case 'S':
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/auction.c Alsherok/src/auction.c
--- afkmud/src/auction.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/auction.c	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/auction.h Alsherok/src/auction.h
--- afkmud/src/auction.h	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/auction.h	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/ban.c Alsherok/src/ban.c
--- afkmud/src/ban.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/ban.c	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/ban.h Alsherok/src/ban.h
--- afkmud/src/ban.h	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/ban.h	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/bet.h Alsherok/src/bet.h
--- afkmud/src/bet.h	2002-04-20 01:53:08.000000000 -0700
+++ Alsherok/src/bet.h	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/bits.c Alsherok/src/bits.c
--- afkmud/src/bits.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/bits.c	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/bits.h Alsherok/src/bits.h
--- afkmud/src/bits.h	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/bits.h	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/boards.c Alsherok/src/boards.c
--- afkmud/src/boards.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/boards.c	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -218,7 +220,7 @@
 	{
 	    fprintf( fp, "Sender  %s~\nDate    %s~\nTo      %s~\nSubject %s~\nVoting %d\nYesvotes %s~\nNovotes %s~\nAbstentions %s~\nText\n%s~\nCtime %ld\n\n",
 		pnote->sender, pnote->date, pnote->to_list, pnote->subject, pnote->voting,
-                pnote->yesvotes, pnote->novotes, pnote->abstentions, pnote->text, pnote->current );
+                pnote->yesvotes, pnote->novotes, pnote->abstentions, pnote->text, (long int)pnote->current );
 	}
 	FCLOSE( fp );
     }
@@ -1826,8 +1833,8 @@
    project->next       = NULL;
    project->prev       = NULL;
    project->coder = NULL;
-   project->description = STRALLOC("");
-   project->name = STRALLOC( "" );
+   project->description = NULL;
+   project->name = NULL;
    project->owner = STRALLOC( "" );
    project->date = STRALLOC( "Not Set?!");
    project->status = STRALLOC( "No update." );
@@ -1850,17 +1857,17 @@
 		if (!str_cmp(word, "Date") )
 			STRFREE(project->date);
 		else if ( !str_cmp(word, "Description") )
-			STRFREE(project->description);
+			DISPOSE( project->description );
 		KEY("Date",		project->date,		fread_string( fp ));		
-	   	KEY("Description",project->description,fread_string(fp));
+	   	KEY("Description",project->description,fread_string_nohash(fp));
 		break;
         case 'E':
             if ( !str_cmp( word, "End" ) )
             {   
 	      if ( !project->description )
-	      	project->description = STRALLOC( "" );
+	      	project->description = str_dup( "" );
 	      if ( !project->name )
-	        project->name = STRALLOC( "" );
+	        project->name = str_dup( "" );
 	      if ( !project->owner )
 	        project->owner = STRALLOC( "" );
 	      if ( !project->date )
@@ -1896,7 +1903,7 @@
 		break;
 	case 'N':
 	    if ( !str_cmp(word, "Name") )
-	    	STRFREE(project->name );
+	    	DISPOSE(project->name );
 	    KEY( "Name", 		project->name, 		fread_string_nohash( fp ) );
 		break;
 	case 'O':
@@ -1922,8 +1929,8 @@
     log = tlog;
   }
   	DISPOSE( project->coder );
-  	STRFREE( project->description );
-  	STRFREE( project->name );
+   DISPOSE( project->description );
+   DISPOSE( project->name );
   	STRFREE( project->owner );
   	STRFREE( project->date );
   	STRFREE( project->status );
@@ -1992,8 +1999,8 @@
 	      return;
 	   }
 	   pproject = ch->pcdata->dest_buf;
-	   STRFREE( pproject->description );
-	   pproject->description = copy_buffer ( ch );
+	   DISPOSE( pproject->description );
+	   pproject->description = copy_buffer_nohash( ch );
 	   stop_editing( ch );
 	   ch->substate = ch->tempnum;
             write_projects();
@@ -2114,10 +2121,10 @@
 
       CREATE( new_project, PROJECT_DATA, 1 );
       LINK( new_project, first_project, last_project, next, prev );
-      new_project->name = str_dup(argument);
+      new_project->name = str_dup( argument );
       new_project->coder = NULL;
       new_project->taken = FALSE;
-      new_project->description = STRALLOC( "" );
+      new_project->description = NULL;
       strtime = c_time( current_time, -1 );
       new_project->date = STRALLOC( strtime );
       write_projects();
@@ -2149,7 +2156,7 @@
       ch->substate = SUB_PROJ_DESC;
       ch->pcdata->dest_buf = pproject;
       if ( pproject->description == NULL )
-	pproject->description = STRALLOC("");
+	pproject->description = str_dup( "" );
       start_editing( ch, pproject->description );
       editor_desc_printf( ch, "Project description for project '%s'.", pproject->name ? pproject->name : "(No name)" );
       return;
@@ -2176,7 +2183,7 @@
       DISPOSE( pproject->name );
 	DISPOSE( pproject->coder );
 	STRFREE( pproject->owner );
-        STRFREE( pproject->description );
+      DISPOSE( pproject->description );
 	STRFREE( pproject->date );
 	STRFREE( pproject->status );
       DISPOSE( pproject );
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/boards.h Alsherok/src/boards.h
--- afkmud/src/boards.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/boards.h	2003-05-29 02:13:59.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/build.c Alsherok/src/build.c
--- afkmud/src/build.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/build.c	2003-05-29 02:14:00.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/calendar.c Alsherok/src/calendar.c
--- afkmud/src/calendar.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/calendar.c	2003-05-29 02:14:00.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -128,7 +130,7 @@
    static char strtime[128];
    struct tm *timet;
 
-#ifndef WINDOZE
+#if defined(__linux__)
    if( tz > -1 && tz < MAX_TZONE )
    {
       /* timezone external variable in time.h holds the difference in seconds to GMT. */
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/calendar.h Alsherok/src/calendar.h
--- afkmud/src/calendar.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/calendar.h	2003-05-29 02:14:00.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/channels.c Alsherok/src/channels.c
--- afkmud/src/channels.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/channels.c	2003-05-29 02:14:00.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/channels.h Alsherok/src/channels.h
--- afkmud/src/channels.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/channels.h	2003-05-29 02:14:00.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/clans.c Alsherok/src/clans.c
--- afkmud/src/clans.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/clans.c	2003-05-29 02:14:00.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/clans.h Alsherok/src/clans.h
--- afkmud/src/clans.h	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/clans.h	2003-05-29 02:14:00.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/color.c Alsherok/src/color.c
--- afkmud/src/color.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/color.c	2003-05-29 02:14:01.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/color.h Alsherok/src/color.h
--- afkmud/src/color.h	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/color.h	2003-05-29 02:14:01.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/comm.c Alsherok/src/comm.c
--- afkmud/src/comm.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/comm.c	2003-05-29 02:14:01.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -34,7 +36,7 @@
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <dlfcn.h>
-#ifdef WINDOZE
+#if defined(__CYGWIN__)
 #include <crypt.h>
 #endif
 #include "mud.h"
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/comments.c Alsherok/src/comments.c
--- afkmud/src/comments.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/comments.c	2003-05-29 02:14:01.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/const.c Alsherok/src/const.c
--- afkmud/src/const.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/const.c	2003-05-29 02:14:01.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
Common subdirectories: afkmud/src/CVS and Alsherok/src/CVS
Common subdirectories: afkmud/src/cxref and Alsherok/src/cxref
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/db.c Alsherok/src/db.c
--- afkmud/src/db.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/db.c	2003-05-29 02:14:01.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -942,8 +944,8 @@
 	fprintf( fp, "Testmode		%d\n", sys.TESTINGMODE );
 	fprintf( fp, "Rent		%d\n", sys.RENT );
 	fprintf( fp, "Mapsize		%d\n", sys.mapsize );
-      fprintf( fp, "Motd		%ld\n", sys.motd );
-	fprintf( fp, "Imotd		%ld\n", sys.imotd );
+      fprintf( fp, "Motd		%ld\n", (long int)sys.motd );
+	fprintf( fp, "Imotd		%ld\n", (long int)sys.imotd );
       fprintf( fp, "Webcounter	%d\n", sys.webcounter );
 	fprintf( fp, "Webtoggle		%d\n", sys.webtoggle );
 	fprintf( fp, "Telnet		%s~\n", sys.telnet );
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/deity.c Alsherok/src/deity.c
--- afkmud/src/deity.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/deity.c	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/deity.h Alsherok/src/deity.h
--- afkmud/src/deity.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/deity.h	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/dns.h Alsherok/src/dns.h
--- afkmud/src/dns.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/dns.h	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/editor.c Alsherok/src/editor.c
--- afkmud/src/editor.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/editor.c	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/editor.h Alsherok/src/editor.h
--- afkmud/src/editor.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/editor.h	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/environment.c Alsherok/src/environment.c
--- afkmud/src/environment.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/environment.c	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/environment.h Alsherok/src/environment.h
--- afkmud/src/environment.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/environment.h	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/event.c Alsherok/src/event.c
--- afkmud/src/event.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/event.c	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/event.h Alsherok/src/event.h
--- afkmud/src/event.h	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/event.h	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/event_handler.c Alsherok/src/event_handler.c
--- afkmud/src/event_handler.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/event_handler.c	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/fight.c Alsherok/src/fight.c
--- afkmud/src/fight.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/fight.c	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/fight.h Alsherok/src/fight.h
--- afkmud/src/fight.h	2002-12-19 04:58:35.000000000 -0800
+++ Alsherok/src/fight.h	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/finger.c Alsherok/src/finger.c
--- afkmud/src/finger.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/finger.c	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -526,7 +528,7 @@
 	send_to_char( "&wImmortal Information\n\r", ch );
 	send_to_char( "--------------------\n\r", ch );
 	ch_printf( ch, "&wIP Info       : &G%s\n\r", victim->pcdata->lasthost );
-	ch_printf( ch, "&wTime played   : &G%ld hours\n\r", GET_TIME_PLAYED( victim ) );
+	ch_printf( ch, "&wTime played   : &G%ld hours\n\r", (long int)GET_TIME_PLAYED( victim ) );
       ch_printf( ch, "&wAuthorized by : &G%s\n\r",
 	   victim->pcdata->authed_by ? victim->pcdata->authed_by : ( sysdata.WAIT_FOR_AUTH ? "Not Authed" : "The Code" ) );
       ch_printf( ch, "&wPrivacy Status: &G%s\n\r", IS_SET( victim->pcdata->flags, PCFLAG_PRIVACY ) ? "Enabled" : "Disabled" );
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/finger.h Alsherok/src/finger.h
--- afkmud/src/finger.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/finger.h	2003-05-29 02:14:02.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/handler.c Alsherok/src/handler.c
--- afkmud/src/handler.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/handler.c	2003-05-29 02:14:03.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/help.c Alsherok/src/help.c
--- afkmud/src/help.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/help.c	2003-05-29 02:14:03.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/help.h Alsherok/src/help.h
--- afkmud/src/help.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/help.h	2003-05-29 02:14:03.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/hotboot.c Alsherok/src/hotboot.c
--- afkmud/src/hotboot.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/hotboot.c	2003-05-29 02:14:03.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/hotboot.h Alsherok/src/hotboot.h
--- afkmud/src/hotboot.h	2002-12-28 19:13:16.000000000 -0800
+++ Alsherok/src/hotboot.h	2003-05-29 02:14:03.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/i3.c Alsherok/src/i3.c
--- afkmud/src/i3.c	2003-05-14 10:17:29.000000000 -0700
+++ Alsherok/src/i3.c	2003-05-29 02:14:03.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -1622,7 +1624,7 @@
 	fprintf( fp, "%s", "#UCACHE\n" );
 	fprintf( fp, "Name %s~\n", user->name );
 	fprintf( fp, "Sex  %d\n", user->gender );
-	fprintf( fp, "Time %ld\n", user->time );
+	fprintf( fp, "Time %ld\n", (long int)user->time );
 	fprintf( fp, "%s", "End\n\n" );
    }
    fprintf( fp, "%s", "#END\n" );
@@ -5616,7 +5618,7 @@
 
    if( CH_LEVEL(ch) < this_mud->adminlevel )
    {
-	send_to_char( "This function is restricted to administrators only.", ch );
+	i3_to_char( "This function is restricted to administrators only.", ch );
 	return;
    }
 
@@ -7449,7 +7451,7 @@
 	else
 	{
 	   sprintf( buf, "%s", person );
-	   tolower( buf[0] );
+	   buf[0] = tolower( buf[0] );
 	   I3_send_channel_t( channel, CH_NAME(ch), mud, buf, msg_o, msg_t, person );
 	}
 	if( skeleton )
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/i3cfg.h Alsherok/src/i3cfg.h
--- afkmud/src/i3cfg.h	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/i3cfg.h	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -30,7 +32,7 @@
 /* Ported to Smaug 1.4a by Samson of Alsherok.
  * Consolidated for cross-codebase compatibility by Samson of Alsherok.
  * Modifications and enhancements to the code
- * Copyright (c)2001-2002 Roger Libiez ( Samson )
+ * Copyright (c)2001-2003 Roger Libiez ( Samson )
  * Registered with the United States Copyright Office
  * TX 5-562-404
  *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/i3.h Alsherok/src/i3.h
--- afkmud/src/i3.h	2003-05-14 10:17:29.000000000 -0700
+++ Alsherok/src/i3.h	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -31,7 +33,7 @@
 /* Ported to Smaug 1.4a by Samson of Alsherok.
  * Consolidated for cross-codebase compatibility by Samson of Alsherok.
  * Modifications and enhancements to the code
- * Copyright (c)2001-2002 Roger Libiez ( Samson )
+ * Copyright (c)2001-2003 Roger Libiez ( Samson )
  * Registered with the United States Copyright Office
  * TX 5-562-404
  */
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/iafk.c Alsherok/src/iafk.c
--- afkmud/src/iafk.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/iafk.c	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -735,7 +737,7 @@
       ch_printf( ch, "%sYour birthday is: %sDay of %s, %d%s day in the Month of %s, in the year %d.\n\r",
 	   s2, s1, day_name[ch->pcdata->day % 13], day, suf, month_name[ch->pcdata->month], ch->pcdata->year );
 
-   ch_printf( ch, "%sYou have played for %s%ld %shours.\n\r", s2, s3, GET_TIME_PLAYED(ch), s1 );
+   ch_printf( ch, "%sYou have played for %s%ld %shours.\n\r", s2, s3, (long int)GET_TIME_PLAYED(ch), s1 );
 
    if( ch->pcdata->deity )
       ch_printf( ch, "%sYou have devoted to %s%s.\n\r", s2, s3, ch->pcdata->deity->name );
@@ -877,15 +879,10 @@
 	{
          ++cnt;
          
-         /* pager_printf( ch, "%s%s%17s %s(%s%11s%s) ",
-		s2, ch->level < skill_table[sn]->skill_level[ch->class] ? "&W*" : " ", 
-		skill_table[sn]->name, s1, s3, how_good(ch->pcdata->learned[sn]), s1 ); */
-         
          /* Edited by Whir to look pretty, still want to improve it though - 1/30/03 */
-         pager_printf( ch, "%s%22s%s%s(%s%11s%s)",
-		s2, skill_table[sn]->name,
-		ch->level < skill_table[sn]->skill_level[ch->class] ? "&W*" : " ",
-		s1, s3, how_good(ch->pcdata->learned[sn]), s1 );
+         pager_printf( ch, "%s%22s%s%s(%s%11s%s)", s2, skill_table[sn]->name,
+		( ch->level < skill_table[sn]->skill_level[ch->class] && ch->level < skill_table[sn]->race_level[ch->race] )
+		? "&W*" : " ", s1, s3, how_good(ch->pcdata->learned[sn]), s1 );
          
             if( ++col % 2 == 0 )
                send_to_pager( "\n\r", ch ); 
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/idale.c Alsherok/src/idale.c
--- afkmud/src/idale.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/idale.c	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -476,7 +478,7 @@
     if (!IS_NPC(ch)) 
     {
 	ch_printf(ch, "%sThis ranks you as: %s%s%s%s\n\r", s1,s3,ch->name,ch->pcdata->title,s1);
-	ch_printf(ch, "%sYou have been playing for: %s%ld%s hours.\n\r", s1,s2,GET_TIME_PLAYED(ch),s1);
+	ch_printf(ch, "%sYou have been playing for: %s%ld%s hours.\n\r", s1,s2,(long int)GET_TIME_PLAYED(ch),s1);
     }
 
     if (!IS_IMMORTAL(ch)) 
@@ -796,16 +798,10 @@
 	  {
             ++cnt;
             
-            /* pager_printf( ch, "%s%-18.18s%s  (%-14.14s) ", color_str( AT_SKILL, ch ),
-		   ch->level < skill_table[sn]->skill_level[ch->class] ? "&W*" : "",
-		   skill_table[sn]->name, how_good(ch->pcdata->learned[sn]) ); */
-
 	    /* Modified by Whir to look pretty - 1/30/2003 */   
-	    pager_printf( ch, "%s%22s%s(%11s)",
-	    	   color_str( AT_SKILL, ch ),
-	    	   skill_table[sn]->name,
-		   ch->level < skill_table[sn]->skill_level[ch->class] ? "&W*&D" : " ",
-		   how_good(ch->pcdata->learned[sn]) );
+	    pager_printf( ch, "%s%22s%s(%11s)", color_str( AT_SKILL, ch ), skill_table[sn]->name,
+		   ( ch->level < skill_table[sn]->skill_level[ch->class] && ch->level < skill_table[sn]->race_level[ch->race] )
+		   ? "&W*&D" : " ", how_good(ch->pcdata->learned[sn]) );
 		   
             if ( ++col % 2 == 0 )
                 send_to_pager( "\n\r", ch ); 
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/imm_host.c Alsherok/src/imm_host.c
--- afkmud/src/imm_host.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/imm_host.c	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/imm_host.h Alsherok/src/imm_host.h
--- afkmud/src/imm_host.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/imm_host.h	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/interface.c Alsherok/src/interface.c
--- afkmud/src/interface.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/interface.c	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/interp.c Alsherok/src/interp.c
--- afkmud/src/interp.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/interp.c	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/ismaug.c Alsherok/src/ismaug.c
--- afkmud/src/ismaug.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/ismaug.c	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -524,7 +526,7 @@
     send_to_char("----------------------------------------------------------------------------\n\r", ch);
     
     ch_printf(ch, "LEVEL: %-3.3d         Race : %-15.15s Played: %ld hours\n\r",
-              ch->level, capitalize(get_race(ch)), GET_TIME_PLAYED(ch) );
+              ch->level, capitalize(get_race(ch)), (long int)GET_TIME_PLAYED(ch) );
     
     ch_printf(ch, "AGE  : %-6d      Class: %-15.15s Log In: %s\n\r",
               get_age(ch), capitalize(npc_class[ch->class]), c_time( ch->pcdata->logon, ch->pcdata->timezone ) );
@@ -842,15 +844,10 @@
 	   || ( is_at_gm && is_at_gm->level >= skill_table[sn]->race_level[is_at_gm->race] ) ) 
 	  {
             ++cnt;
-            /* pager_printf( ch, "%18.18s%s %3.3d%%  ", skill_table[sn]->name,
-		   ch->level < skill_table[sn]->skill_level[ch->class] ? "&W*" : "", ch->pcdata->learned[sn] );
-            if ( ++col % 3 == 0 )
-                send_to_pager( "\n\r", ch ); */
             /* Modified by Whir to look pretty - 1/30/2003 */
-            pager_printf( ch, "%26s%s %3d%%  ",
-                   skill_table[sn]->name,
-		   ch->level < skill_table[sn]->skill_level[ch->class] ? "&W*&D" : " ",
-		   ch->pcdata->learned[sn] );
+            pager_printf( ch, "%26s%s %3d%%  ", skill_table[sn]->name,
+		   ( ch->level < skill_table[sn]->skill_level[ch->class] && ch->level < skill_table[sn]->race_level[ch->race] )
+		   ? "&W*&D" : " ", ch->pcdata->learned[sn] );
             
             if ( ++col % 2 == 0 )
                 send_to_pager( "\n\r", ch ); 
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/language.h Alsherok/src/language.h
--- afkmud/src/language.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/language.h	2003-05-29 02:14:04.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/liquids.c Alsherok/src/liquids.c
--- afkmud/src/liquids.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/liquids.c	2003-05-29 02:14:05.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -1263,8 +1265,8 @@
 	   }
 
          /* allow water to be drank; but nothing else on a full stomach     -Nopey */
-         if( ch->pcdata->condition[COND_THIRST] == sysdata.maxcondval
-		|| ch->pcdata->condition[COND_FULL] == sysdata.maxcondval )
+	   if( !IS_NPC(ch) && ( ch->pcdata->condition[COND_THIRST] == sysdata.maxcondval
+		|| ch->pcdata->condition[COND_FULL] == sysdata.maxcondval ) )
 	   {
 		send_to_char( "Your stomach is too full to drink anymore!\n\r", ch );
 		return;
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/liquids.h Alsherok/src/liquids.h
--- afkmud/src/liquids.h	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/liquids.h	2003-05-29 02:14:05.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/magic.c Alsherok/src/magic.c
--- afkmud/src/magic.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/magic.c	2003-05-29 02:14:05.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -22,7 +24,7 @@
 
 #include <string.h>
 #include <ctype.h>
-#if defined(FREEBSD) || defined(WINDOZE)
+#if defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__FreeBSD__)
 #include <sys/time.h>
 #endif
 #include "mud.h"

diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/Makefile Alsherok/src/Makefile
--- afkmud/src/Makefile	2003-05-13 16:18:00.000000000 -0700
+++ Alsherok/src/Makefile	2003-05-29 02:14:07.000000000 -0700
@@ -1,44 +1,46 @@
 #This is the AFKMud Makefile.
 #This should be usable on pretty much any Linux system.
 #Refer to your 'man gcc' for explanations of these options
-#To compile in FreeBSD, use the gmake compiler.
-
-#Uncomment if not compiling on Cygwin or FreeBSD
-LINUX = 1
-
-#Uncomment to compile in Cygwin
-#WINDOZE = -DWINDOZE
-
-#Uncomment to compile in FreeBSD
-#FBSD = -DFREEBSD
-
-# Uncomment the two lines below if compiling on a Solaris box
-#SOLARIS_FLAG = -Dsun -DSYSV -Wno-char-subscripts
-#SOLARIS_LINK = -lnsl -lsocket -lresolv
+#To compile in FreeBSD or OpenBSD, use the gmake compiler.
 
 #Used for Alsherok stuff, uncommenting it should have no affect, though why would you want to?
-#ALSHEROK = 1
+#ALSHEROK = 1
 
 #Change this to reflect whichever compiler you want to use.
 CC      = gcc
-#PROF    = -p
-NOCRYPT = 
 
 #Type of machine to compile for. Athlon works just as well on Duron too.
 #The march option needs to match the general family of CPU.
 #If you don't know what to set for these options, and your system administrator doesn't either, comment this line out
 MACHINE = -mcpu=athlon -march=athlon
 
+#Uncomment if compiling in Windows under Cygwin
+#WINDOZE = 1
+
+# Uncomment the two lines below if compiling on a Solaris box
+#SOLARIS_FLAG = -Dsun -DSYSV -Wno-char-subscripts
+#SOLARIS_LINK = -lnsl -lsocket -lresolv
+
 #Uncomment the line below if you are getting undefined crypt errors.
 NEED_CRYPT = -lcrypt
 
+#Uncomment the line below if you are getting undefined references to dlsym, dlopen, and dlclose.
+#Comment it out if you get errors about ldl not being found.
+NEED_DL = -ldl
+
+#Some systems need this for dynamic linking to work.
+EXPORT_SYMBOLS = -export-dynamic
+
+#Math functions - uncomment if you get errors or warnings about math functions.
+MATH_LIB = -lm
+
+#Set this to -DNOCRYPT to disable encrypted password support.
+NOCRYPT = 
+
 #String hashing. Only comment this out if you have a very good reason for it.
 #If you don't know what this is for, LEAVE IT ALONE!
 HASH = 1
 
-#Math functions - uncomment if you get errors or warnings about math functions
-MATH_LIB = -lm
-
 #Memory Debugger - comment out to turn the debugger off, uncomment to use it.
 #MEMDEBUG = 1
 
@@ -46,27 +48,25 @@
 I3 = 1
 
 #IMC2 - Comment out to disable IMC2 support
-#IMC = 1
+#IMC = 1
 
 #Internal Web Server - comment out to disable web server code.
 WEB = 1
 
 #Multiport support. Comment out to disable this feature.
-#MULTIPORT = 1
+#MULTIPORT = 1
 
 #Miscellaneous compiler options.
-OPT_FLAG = -pipe
+OPT_FLAG = -pipe -Os
+DEBUG_FLAG = -g2
+#PROF_FLAG = -p
 
 W_FLAGS = -Wall -Werror -Wformat-security -Winline -Wstrict-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wcast-align -Wcast-qual
 
-C_FLAGS = $(MACHINE) -g2 -Os $(W_FLAGS) $(OPT_FLAG) $(PROF) $(NOCRYPT) $(WINDOZE) $(SOLARIS_FLAG) -export-dynamic
-ifdef LINUX
-L_FLAGS = $(MACHINE) $(OPT_FLAG) $(PROF) $(SOLARIS_LINK) $(NEED_CRYPT) $(MATH_LIB) -lz -ldl
-else
-L_FLAGS = $(MACHINE) $(OPT_FLAG) $(PROF) $(SOLARIS_LINK) $(NEED_CRYPT) $(MATH_LIB) -lz
-endif
+C_FLAGS = $(MACHINE) $(W_FLAGS) $(DEBUG_FLAG) $(OPT_FLAG) $(PROF_FLAG) $(NOCRYPT) $(SOLARIS_FLAG) $(EXPORT_SYMBOLS)
+L_FLAGS = $(MACHINE) $(DEBUG_FLAG) $(OPT_FLAG) $(PROF_FLAG) $(EXPORT_SYMBOLS) $(SOLARIS_LINK) $(NEED_CRYPT) $(MATH_LIB) -lz $(NEED_DL)
 #D_FLAGS : For the DNS Resolver process. No need in linking all the extra libs for this.
-D_FLAGS = $(MACHINE) -g2 -O $(W_FLAGS) $(PROF) $(SOLARIS_LINK)
+D_FLAGS = $(MACHINE) $(W_FLAGS) $(DEBUG_FLAG) $(OPT_FLAG) $(PROF_FLAG) $(SOLARIS_LINK)
 
 C_FILES = act_comm.c act_info.c act_move.c act_obj.c act_wiz.c afk.c \
           archery.c areaconvert.c auction.c ban.c bits.c boards.c \
@@ -99,6 +99,13 @@
    C_FLAGS := $(C_FLAGS) -DI3
 endif
 
+
+
+
+
+
+
+
 ifdef MULTIPORT
    C_FILES := shell.c $(C_FILES)
    C_FLAGS := $(C_FLAGS) -DMULTIPORT
@@ -113,59 +120,46 @@
 
 H_FILES = $(wildcard *.h) 
 
+ifdef WINDOZE
+   AFKMUD = afkmud.exe
+   RESOLVER = resolver.exe
+else
+   AFKMUD = afkmud
+   RESOLVER = resolver
+endif
+
 all:
 	$(MAKE) -s afkmud
 	$(MAKE) -s resolver
 
-ifdef WINDOZE
 afkmud: $(O_FILES)
-	rm -f afkmud.exe
+	rm -f $(AFKMUD)
+ifdef WINDOZE
 	dlltool --export-all --output-def afkmud.def $(O_FILES)
-	dlltool --dllname afkmud.exe --output-exp afkmud.exp --def afkmud.def
-	$(CC) -export-dynamic -o afkmud.exe $(O_FILES) afkmud.exp $(L_FLAGS)
-	echo "Done compiling mud.";
-	chmod g+w afkmud.exe
-	chmod a+x afkmud.exe
-	chmod g+w $(O_FILES)
-
-resolver: resolver.o
-	rm -f resolver.exe
-	$(CC) $(D_FLAGS) -o resolver resolver.o
-	echo "Done compiling resolver.";
-	chmod g+w resolver.exe 
-	chmod a+x resolver.exe
-	chmod g+w resolver.o
-
-clean:  
-	rm -f o/*.o afkmud.exe afkmud.def afkmud.exp core resolver.exe resolver.o
-	$(MAKE) all
-        
-purge:  
-	rm -f o/*.o afkmud.exe afkmud.def afkmud.exp core resolver.exe resolver.o
+	dlltool --dllname $(AFKMUD) --output-exp afkmud.exp --def afkmud.def
+	$(CC) -o $(AFKMUD) $(O_FILES) afkmud.exp $(L_FLAGS)
 else
-afkmud: $(O_FILES)
-	rm -f afkmud
-	$(CC) -export-dynamic -o afkmud $(O_FILES) $(L_FLAGS)
+	$(CC) -o $(AFKMUD) $(O_FILES) $(L_FLAGS)
+endif
 	echo "Done compiling mud.";
-	chmod g+w afkmud
-	chmod a+x afkmud
+	chmod g+w $(AFKMUD)
+	chmod a+x $(AFKMUD)
 	chmod g+w $(O_FILES)
 
 resolver: resolver.o
-	rm -f resolver 
-	$(CC) $(D_FLAGS) -o resolver resolver.o
+	rm -f $(RESOLVER) 
+	$(CC) $(D_FLAGS) -o $(RESOLVER) resolver.o
 	echo "Done compiling resolver.";
-	chmod g+w resolver 
-	chmod a+x resolver 
+	chmod g+w $(RESOLVER)
+	chmod a+x $(RESOLVER)
 	chmod g+w resolver.o
 
 clean:  
-	rm -f o/*.o afkmud core resolver resolver.o
+	rm -f o/*.o $(AFKMUD) afkmud.def afkmud.exp core $(RESOLVER) resolver.o
 	$(MAKE) all
         
 purge:  
-	rm -f o/*.o afkmud core resolver resolver.o
-endif
+	rm -f o/*.o $(AFKMUD) afkmud.def afkmud.exp core $(RESOLVER) resolver.o
 
 o/%.o: %.c
 	echo "  Compiling $@....";
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mccp.c Alsherok/src/mccp.c
--- afkmud/src/mccp.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/mccp.c	2003-05-29 02:14:07.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -44,7 +46,7 @@
 #include "mud.h"
 #include "mccp.h"
 
-#ifdef FREEBSD
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
 #define ENOSR 63
 #endif
 
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mccp.h Alsherok/src/mccp.h
--- afkmud/src/mccp.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/mccp.h	2003-05-29 02:14:07.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/misc.c Alsherok/src/misc.c
--- afkmud/src/misc.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/misc.c	2003-05-29 02:14:07.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/msp.c Alsherok/src/msp.c
--- afkmud/src/msp.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/msp.c	2003-05-29 02:14:07.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mspecial.c Alsherok/src/mspecial.c
--- afkmud/src/mspecial.c	2003-05-07 12:03:07.000000000 -0700
+++ Alsherok/src/mspecial.c	2003-05-29 02:14:07.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mspecial.h Alsherok/src/mspecial.h
--- afkmud/src/mspecial.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/mspecial.h	2003-05-29 02:14:07.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/msp.h Alsherok/src/msp.h
--- afkmud/src/msp.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/msp.h	2003-05-29 02:14:07.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mud_comm.c Alsherok/src/mud_comm.c
--- afkmud/src/mud_comm.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/mud_comm.c	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mud.h Alsherok/src/mud.h
--- afkmud/src/mud.h	2003-05-14 10:17:29.000000000 -0700
+++ Alsherok/src/mud.h	2003-05-29 02:14:07.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -26,7 +28,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
-#ifdef FREEBSD
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
 #include <sys/types.h>
 #endif
 
@@ -34,7 +36,7 @@
  * If you want to add your own, make a new set of defines and ADD the information.
  * Removing this is a violation of your license agreement.
  */
-#define CODEVERSION "AFKMud 1.51a"
+#define CODEVERSION "AFKMud 1.52"
 #define COPYRIGHT "Copyright Alsherok 1997-2003"
 
 typedef	int				ch_ret;
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mud_prog.c Alsherok/src/mud_prog.c
--- afkmud/src/mud_prog.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/mud_prog.c	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mud_prog.h Alsherok/src/mud_prog.h
--- afkmud/src/mud_prog.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/mud_prog.h	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mxp.c Alsherok/src/mxp.c
--- afkmud/src/mxp.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/mxp.c	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/mxp.h Alsherok/src/mxp.h
--- afkmud/src/mxp.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/mxp.h	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/new_auth.c Alsherok/src/new_auth.c
--- afkmud/src/new_auth.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/new_auth.c	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -284,7 +287,7 @@
             if( unlink(file) == -1 )
                perror( "Unlink: do_auth: \"clean\"" );
             else
-               log_printf( "%s deleted for inactivity: %ld days", file, tdiff );
+               log_printf( "%s deleted for inactivity: %ld days", file, (long int)tdiff );
          }
       }
    }
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/new_auth.h Alsherok/src/new_auth.h
--- afkmud/src/new_auth.h	2002-10-25 02:13:04.000000000 -0700
+++ Alsherok/src/new_auth.h	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
Common subdirectories: afkmud/src/o and Alsherok/src/o
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/olc.h Alsherok/src/olc.h
--- afkmud/src/olc.h	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/olc.h	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/olcmob.c Alsherok/src/olcmob.c
--- afkmud/src/olcmob.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/olcmob.c	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -302,6 +304,11 @@
         case MEDIT_SUSCEPTIBLE:
             ch_printf_color( d->character, "\n\rCurrent flags: &c%s&w\n\r", flag_string( victim->susceptible, ris_flags ) );
             break;
+	  /* FIX: Editing Absorb flags did not show current flags */
+	  /* Zarius 5/19/2003 */
+	  case MEDIT_ABSORB:
+            ch_printf_color( d->character, "\n\rCurrent flags: &c%s&w\n\r", flag_string( victim->absorb, ris_flags ) );
+            break;
         }
     }
     send_to_char( "Enter flag (0 to quit): ", d->character );
@@ -1252,6 +1259,9 @@
 
     case MEDIT_SPEC:
 	number = atoi( arg );
+      /* FIX: Selecting 0 crashed the mud when editing spec procs --Zarius 5/19/2003 */
+	if ( number == 0 )    
+         break;
       if( number < 1 || number >= SPEC_MAX )
 	{
 	   victim->spec_fun = NULL;
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/olcobj.c Alsherok/src/olcobj.c
--- afkmud/src/olcobj.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/olcobj.c	2003-05-29 02:14:08.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/olcroom.c Alsherok/src/olcroom.c
--- afkmud/src/olcroom.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/olcroom.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/overland.c Alsherok/src/overland.c
--- afkmud/src/overland.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/overland.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/overland.h Alsherok/src/overland.h
--- afkmud/src/overland.h	2002-10-25 02:13:05.000000000 -0700
+++ Alsherok/src/overland.h	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/pets.c Alsherok/src/pets.c
--- afkmud/src/pets.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/pets.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/pfiles.c Alsherok/src/pfiles.c
--- afkmud/src/pfiles.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/pfiles.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/pfiles.h Alsherok/src/pfiles.h
--- afkmud/src/pfiles.h	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/pfiles.h	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/player.c Alsherok/src/player.c
--- afkmud/src/player.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/player.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/polymorph.c Alsherok/src/polymorph.c
--- afkmud/src/polymorph.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/polymorph.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/polymorph.h Alsherok/src/polymorph.h
--- afkmud/src/polymorph.h	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/polymorph.h	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/rent.c Alsherok/src/rent.c
--- afkmud/src/rent.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/rent.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/renumber.c Alsherok/src/renumber.c
--- afkmud/src/renumber.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/renumber.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/reset.c Alsherok/src/reset.c
--- afkmud/src/reset.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/reset.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/resolver.c Alsherok/src/resolver.c
--- afkmud/src/resolver.c	2002-12-24 23:02:26.000000000 -0800
+++ Alsherok/src/resolver.c	2003-05-29 02:14:09.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -34,12 +36,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#if defined(FREEBSD) || defined(WINDOZE)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__CYGWIN__)
 #include <sys/types.h>
 #include <sys/socket.h>
 #endif
+#include <netinet/in.h>
+#include <netdb.h>
 
 char *resolve_address( int address )
 {
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/save.c Alsherok/src/save.c
--- afkmud/src/save.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/save.c	2003-05-29 02:14:10.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -412,9 +413,9 @@
     fprintf( fp, "RentRooms %d %d %d\n", ch->pcdata->alsherok, ch->pcdata->eletar, ch->pcdata->alatia );
     
     /* MOTD times - Samson 12-31-00 */
-    fprintf( fp, "Motd		%ld\n",	ch->pcdata->motd );
-    fprintf( fp, "Imotd		%ld\n",	ch->pcdata->imotd );
-    fprintf( fp, "Boards	%ld\n",	ch->pcdata->boards );
+    fprintf( fp, "Motd		%ld\n",	(long int)ch->pcdata->motd );
+    fprintf( fp, "Imotd		%ld\n",	(long int)ch->pcdata->imotd );
+    fprintf( fp, "Boards	%ld\n",	(long int)ch->pcdata->boards );
     if( ch->pcdata->chan_listen )
        fprintf( fp, "Channels    %s~\n",	ch->pcdata->chan_listen );
 #ifdef I3
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/shell.c Alsherok/src/shell.c
--- afkmud/src/shell.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/shell.c	2003-05-29 02:14:10.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/shell.h Alsherok/src/shell.h
--- afkmud/src/shell.h	2002-12-28 19:13:16.000000000 -0800
+++ Alsherok/src/shell.h	2003-05-29 02:14:10.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/ships.c Alsherok/src/ships.c
--- afkmud/src/ships.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/ships.c	2003-05-29 02:14:10.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/ships.h Alsherok/src/ships.h
--- afkmud/src/ships.h	2002-10-25 02:13:05.000000000 -0700
+++ Alsherok/src/ships.h	2003-05-29 02:14:10.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/shops.c Alsherok/src/shops.c
--- afkmud/src/shops.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/shops.c	2003-05-29 02:14:10.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/shops.h Alsherok/src/shops.h
--- afkmud/src/shops.h	2002-10-25 02:13:05.000000000 -0700
+++ Alsherok/src/shops.h	2003-05-29 02:14:10.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/skills.c Alsherok/src/skills.c
--- afkmud/src/skills.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/skills.c	2003-05-29 02:14:11.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -22,7 +24,7 @@
 
 #include <string.h>
 #include <limits.h>
-#if defined(FREEBSD) || defined(WINDOZE)
+#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__)
 #include <sys/time.h>
 #endif
 #include "mud.h"
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/skyship.c Alsherok/src/skyship.c
--- afkmud/src/skyship.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/skyship.c	2003-05-29 02:14:11.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/skyship.h Alsherok/src/skyship.h
--- afkmud/src/skyship.h	2002-10-25 02:13:05.000000000 -0700
+++ Alsherok/src/skyship.h	2003-05-29 02:14:11.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/slay.c Alsherok/src/slay.c
--- afkmud/src/slay.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/slay.c	2003-05-29 02:14:11.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/slay.h Alsherok/src/slay.h
--- afkmud/src/slay.h	2002-10-25 02:13:05.000000000 -0700
+++ Alsherok/src/slay.h	2003-05-29 02:14:11.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/starmap.c Alsherok/src/starmap.c
--- afkmud/src/starmap.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/starmap.c	2003-05-29 02:14:11.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/tables.c Alsherok/src/tables.c
--- afkmud/src/tables.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/tables.c	2003-05-29 02:14:11.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/track.c Alsherok/src/track.c
--- afkmud/src/track.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/track.c	2003-05-29 02:14:11.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/treasure.c Alsherok/src/treasure.c
--- afkmud/src/treasure.c	2003-05-01 08:50:27.000000000 -0700
+++ Alsherok/src/treasure.c	2003-05-29 02:14:11.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/treasure.h Alsherok/src/treasure.h
--- afkmud/src/treasure.h	2002-12-19 04:58:35.000000000 -0800
+++ Alsherok/src/treasure.h	2003-05-29 02:14:12.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/update.c Alsherok/src/update.c
--- afkmud/src/update.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/update.c	2003-05-29 02:14:12.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/web.h Alsherok/src/web.h
--- afkmud/src/web.h	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/web.h	2003-05-29 02:14:12.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
diff -uNbB --exclude-from=diffexcludes.txt afkmud/src/websvr.c Alsherok/src/websvr.c
--- afkmud/src/websvr.c	2003-05-13 16:16:44.000000000 -0700
+++ Alsherok/src/websvr.c	2003-05-29 02:14:12.000000000 -0700
@@ -5,8 +5,10 @@
  *                /-----\  |      | \  |  v  | |     | |  /                 *
  *               /       \ |      |  \ |     | +-----+ +-/                  *
  ****************************************************************************
- * AFKMud Copyright 1997-2002 Alsherok. Contributors: Samson, Dwip, Whir,   *
- * Cyberfox, Karangi, Rathian, Cam, Raine, and Tarl.                        *
+ * AFKMud Copyright 1997-2003 by Roger Libiez (Samson),                     *
+ * Levi Beckerson (Whir), Michael Ward (Tarl), Erik Wolfe (Dwip),           *
+ * Cameron Carroll (Cam), Cyberfox, Karangi, Rathian, Raine, and Adjani.    *
+ * All Rights Reserved.                                                     *
  *                                                                          *
  * Original SMAUG 1.4a written by Thoric (Derek Snider) with Altrag,        *
  * Blodkai, Haus, Narn, Scryn, Swordbearer, Tricops, Gorog, Rennard,        *
@@ -82,13 +84,13 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#ifdef FREEBSD
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <netinet/in.h>
 #include <sys/time.h>
 #endif
-#ifdef WINDOZE
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#if defined(__CYGWIN__)
 #include <crypt.h>
 #endif
 #include "mud.h"
