--- src/server/cmdline.c	2010-02-21 07:59:29.000000000 -0800
+++ ../xpilot-4.5.5-changes/cmdline.c	2010-04-17 19:54:07.000000000 -0700
@@ -85,6 +85,7 @@
 char		*mapName;		/* Name of the universe */
 char		*mapAuthor;		/* Name of the creator */
 int		contactPort;		/* Contact port number */
+char		*greeting;		/* Prints a short greeting to players */
 char		*serverHost;		/* Host name (for multihomed hosts) */
 
 bool		crashWithPlayer;	/* Can players overrun other players? */
@@ -241,6 +242,7 @@
 char		*denyHosts;		/* Computers which are denied service */
 DFLOAT		gameDuration;		/* total duration of game in minutes */
 bool		allowViewing;		/* Are players allowed to watch others? */
+bool		pauseTax;		/* Do scores decrease while paused? */
 
 bool		teamAssign;		/* Assign player to team if not set? */
 bool		teamImmunity;		/* Is team immune from player action */
@@ -795,6 +797,16 @@
 	OPT_COMMAND | OPT_DEFAULTS | OPT_VISIBLE
     },
     {
+	"greeting",
+	"xpilotGreeting",
+	NULL,
+	&greeting,
+	valString,
+	tuner_dummy,
+	"Short greeting string for players when they login to server.\n",
+	OPT_ORIGIN_ANY | OPT_VISIBLE
+    },
+    {
 	"serverHost",
 	"serverHost",
 	NULL,
@@ -3154,6 +3166,16 @@
 	OPT_ORIGIN_ANY | OPT_VISIBLE
     },
     {
+	"pauseTax",
+	"pauseTax",
+	"true",
+	&pauseTax,
+	valBool,
+	tuner_dummy,
+	"Do players' scores decrease slightly while paused?\n",
+	OPT_ORIGIN_ANY | OPT_VISIBLE
+    },
+    {
 	"friction",
 	"friction",
 	"0.0",