[agd-cvs] server/lib/sys master.c,1.12,1.13 player.c,1.12,1.13

[Peep P. <so...@us...>]

Update of /cvsroot/agd/server/lib/sys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19724/lib/sys

Modified Files:
	master.c player.c 
Log Message:
Major cleanups.

Index: player.c
===================================================================
RCS file: /cvsroot/agd/server/lib/sys/player.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- player.c	28 Mar 2004 18:02:33 -0000	1.12
+++ player.c	1 Apr 2004 19:17:13 -0000	1.13
@@ -14,16 +14,19 @@
 }
 
 void write_help() {
-	write("Available commands:\n");
-	write("\t/help: Displays this text.\n");
-	write("\t/uptime: Shows for how long the driver has been running.\n");
-	write("\t/version: Shows AGD version information.\n");
-	write("\t/quit: Quits the game.\n");
-	write("\t/time: Shows current time.\n");
-	write("\t/.: Repeats last command.\n");
+	write("Available commands:\n"
+		"\t/help: Displays this text.\n"
+		"\t/uptime: Shows for how long the driver has been running.\n"
+		"\t/version: Shows AGD version information.\n"
+		"\t/quit: Quits the game.\n"
+		"\t/time: Shows current time.\n"
+		"\t/.: Repeats last command.\n");
 }
 
-/* Converts a time integer into a textual representation */
+/* Converts a time integer into a textual representation,
+ * but doesn't return a date like asctime(), but returns
+ * the length of the time period (61 = 1 minute and 1 second,
+ * 3600 = 1 hour etc. Can anyone describe this better?) */
 string ctime(int t) {
 	int secs, mins, hrs, days;
 	string ret;
@@ -42,7 +45,6 @@
 		}
 	}
 
-	ret = ""; /* :-( */
 	if(days) {
 		ret += days + " day" + days>1?"s":"";
 		if(hrs || mins || secs)
@@ -101,8 +103,6 @@
 		} else if(s == "update") {
 			/* No way of getting arguments. :(
 			 * Oh well, update all them bastards. */
-			write("Warning: master must be destroyed for its " 
-			      "update to take effect.\n");
 			do_update("/sys/master");
 			do_update("/sys/login");
 			do_update("/sys/player");
@@ -115,7 +115,7 @@
 			} else 
 				write("No last command.\n");
 		} else {
-			write("Unknown command.\n");
+			write("Unknown command. Try '/help'.\n");
 		}
 	}
 	if(cmd != "/.") {

Index: master.c
===================================================================
RCS file: /cvsroot/agd/server/lib/sys/master.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- master.c	28 Mar 2004 18:02:33 -0000	1.12
+++ master.c	1 Apr 2004 19:17:13 -0000	1.13
@@ -1,4 +1,5 @@
 string banner;
+int biggest;
  
 int crash(int signal) {
 	if(signal == 11) {
@@ -15,9 +16,7 @@
 }
 
 void write_version() {
-	int biggest;
 	string b;
-	biggest = atoi(read_file("/doc/login/biggest"));
 	b = read_file("/doc/login/" + random(biggest));
 	write(b + banner);
 }
@@ -30,6 +29,7 @@
 }
 
 void create(void) {
-	banner = "\t" + version() + " / " + platform() + "\n"
-		 + "\thttp://agd.sf.net\n\tag...@li...\n";
+	banner = "\n\t" + version() + " / " + platform() + "\n"
+	  + "\thttp://agd.sf.net\n\tag...@li...\n";
+	biggest = atoi(read_file("/doc/login/biggest"));
 }