From 546fae59fe2da344207c3fb248f4b8f2a9442573 Mon Sep 17 00:00:00 2001 From: sireus Date: Fri, 29 Jun 2012 14:22:13 +0000 Subject: [PATCH] wording fix, and removed now irrelevant comment git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6849 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/i18n.cpp | 2 -- source/src/server.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/source/src/i18n.cpp b/source/src/i18n.cpp index f5d3ad18..b496d045 100644 --- a/source/src/i18n.cpp +++ b/source/src/i18n.cpp @@ -13,8 +13,6 @@ i18nmanager::i18nmanager(const char *domain, const char *basepath) : domain(doma bind_textdomain_codeset(domain, "UTF-8"); // we use the utf-8 charset only setlocale(LC_NUMERIC, "C"); // make sure numeric is consistent (very important for float usage in scripts) - // Note to self: only do this _after_ using the return value from the previous - // setlocale call - this one will overwrite it } // export gettext to cubescript diff --git a/source/src/server.cpp b/source/src/server.cpp index 97983407..a77cd96a 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -3249,8 +3249,8 @@ void process(ENetPacket *packet, int sender, int chan) } else if( scl.incoming_limit && ( scl.incoming_limit << 20 ) < incoming_size + mapsize + cfgsizegz ) { - reject = "server incoming achieved its limits"; - sendservmsg("\f3server does not support more incomings: limit achieved", sender); + reject = "server incoming reached its limits"; + sendservmsg("\f3server does not support more incomings: limit reached", sender); } else if(mp == MAP_NOTFOUND && strchr(scl.mapperm, 'C') && cl->role < CR_ADMIN) {