From 98f988635cf3a27412c4c510c90f21e9a2d0e0ed Mon Sep 17 00:00:00 2001 From: flowtron Date: Wed, 26 May 2010 20:57:16 +0000 Subject: [PATCH] cosmetic changes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5064 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/client.cpp | 10 +++++----- source/src/server.cpp | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/src/client.cpp b/source/src/client.cpp index ac033cfb..b5451d6c 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -80,10 +80,10 @@ void connectserv_(const char *servername, const char *serverport = NULL, const c if(servername) { addserver(servername, serverport, "0"); - conoutf(_("attempting to connect to %s%c%s"), servername, address.port != CUBE_DEFAULT_SERVER_PORT ? ':' : 0, serverport); + conoutf(_("\f2attempting to %sconnect to \ff%s%c%s"), role==CR_DEFAULT?"":"\f8admin\f2", servername, address.port != CUBE_DEFAULT_SERVER_PORT ? ':' : 0, serverport); if(!resolverwait(servername, &address)) { - conoutf(_("\f3could not resolve server %s"), servername); + conoutf(_("\f2could \f3not resolve\f2 server \ff%s"), servername); clientpassword[0] = '\0'; connectrole = CR_DEFAULT; return; @@ -91,11 +91,11 @@ void connectserv_(const char *servername, const char *serverport = NULL, const c } else { - conoutf(_("attempting to connect over LAN")); + conoutf(_("\f2attempting to connect over \f1LAN")); address.host = ENET_HOST_BROADCAST; } - if(!clienthost) + if(!clienthost) clienthost = enet_host_create(NULL, 2, 3, 0, 0); if(clienthost) @@ -108,7 +108,7 @@ void connectserv_(const char *servername, const char *serverport = NULL, const c } else { - conoutf(_("\f3could not connect to server")); + conoutf(_("\f2could \f3not connect\f2 to server")); clientpassword[0] = '\0'; connectrole = CR_DEFAULT; } diff --git a/source/src/server.cpp b/source/src/server.cpp index 0dfed24d..45f45651 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -420,7 +420,8 @@ void enddemorecord() int mr = gamemillis >= gamelimit ? 0 : (gamelimit - gamemillis + 60000 - 1)/60000; demofile &d = demofiles.add(); formatstring(d.info)("%s: %s, %s, %.2f%s", asctime(), modestr(gamemode), smapname, len > 1024*1024 ? len/(1024*1024.f) : len/1024.0f, len > 1024*1024 ? "MB" : "kB"); - formatstring(d.file)("%s_%s_%s", timestring(), behindpath(smapname), modestr(gamemode, true)); + //formatstring(d.file)("%s_%s_%s", timestring(), behindpath(smapname), modestr(gamemode, true)); // 20100522_10.08.48_ac_mines_DM.dmo + formatstring(d.file)( "%s_%s_%s", modestr(gamemode, true), behindpath(smapname), timestring( true, "%Y.%m.%d_%H%M")); // DM_ac_mines.2010.05.22_1008.dmo if(mr) { concatformatstring(d.info, ", %d mr", mr); concatformatstring(d.file, "_%dmr", mr); } defformatstring(msg)("Demo \"%s\" recorded\nPress F10 to download it from the server..", d.info); sendservmsg(msg);