Update of /cvsroot/agd/server/lib/sys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11122
Modified Files:
player.c
Log Message:
Fixes whitespace in ctime(), uses the new time dfuns.
Index: player.c
===================================================================
RCS file: /cvsroot/agd/server/lib/sys/player.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- player.c 20 Mar 2004 19:15:21 -0000 1.8
+++ player.c 21 Mar 2004 08:53:33 -0000 1.9
@@ -1,4 +1,5 @@
string _name, last_cmd;
+int num_input;
void create() {
input_to("input");
@@ -18,6 +19,7 @@
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");
}
@@ -41,14 +43,23 @@
}
ret = ""; /* :-( */
- if(days)
- ret += days + " day" + days>1?"s":"" + " ";
- if(hrs)
- ret += hrs + " hour" + hrs>1?"s":"" + " ";
- if(mins)
- ret += mins + " minute" + mins>1?"s":"" + " ";
+ if(days) {
+ ret += days + " day" + days>1?"s":"";
+ if(hrs || mins || secs)
+ ret += " ";
+ }
+ if(hrs) {
+ ret += hrs + " hour" + hrs>1?"s":"";
+ if(mins || secs)
+ ret += " ";
+ }
+ if(mins) {
+ ret += mins + " minute" + mins>1?"s":"";
+ if(secs)
+ ret += " ";
+ }
if(secs) {
- ret += secs + " second" + secs>1?"s":"" + " ";
+ ret += secs + " second" + secs>1?"s":"";
}
return ret;
}
@@ -64,16 +75,18 @@
break;
}*/
if(cmd == "/quit") {
- shout(time() + ": " + capitalize(_name) + " has quit the game\n", this_object());
+ shout(asctime(time()) + ": " + capitalize(_name) + " has quit the game\n", this_object());
destruct(this_object());
} else if(cmd == "/uptime") {
- write("The driver has been running for " + ctime(uptime()) + "\n");
- } else if(cmd == "/print_objs") {
- print_objs();
+ write("AGD " + version() + " has been running for " + ctime(uptime()) + ".\n");
} else if(cmd == "/version") {
"/sys/master"->write_version();
} else if(cmd == "/help") {
write_help();
+ } else if(cmd == "/time") {
+ int t = time();
+ write("The current time is: " + asctime(t)
+ + ".\n");
} else if(cmd == "/.") {
if(last_cmd) {
input(last_cmd);
@@ -83,16 +96,21 @@
write("Unknown command.\n");
}
} else {
- shout(time() + ": " + capitalize(_name) + " says: " + cmd + "\n", this_object());
- write(time() + ": You say: " + cmd + "\n");
+ string t = asctime(time());
+ shout(t + ": " + capitalize(_name) + " says: " +
+ cmd + "\n", this_object());
+ write(t + ": You say: " + cmd + "\n");
}
- if(cmd != "/.")
+ if(cmd != "/.") {
last_cmd = cmd;
+ num_input++;
+ }
input_to("input");
}
void write_prompt() {
- write(_name + /* "@" + __HOSTNAME__ + */ "$ ");
+ write(_name + /* "@" + __HOSTNAME__ + */ ":" +
+ num_input + "$ ");
}
void net_dead() {
|
