From 4740d52e909da9e8179955043ee2020bedae6a83 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sun, 10 Apr 2011 17:43:08 +0800 Subject: [PATCH] Added merlo to trusted list and changed default server to merlo --- src/client/main.c | 2 +- src/server/server.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/main.c b/src/client/main.c index d7a8e49..b16c495 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -97,7 +97,7 @@ char *trim(char *string); void CompileRegex(regex_t *regex, const char *pattern, int flags); // === GLOBALS === -char *gsDispenseServer = "heathred"; +char *gsDispenseServer = "merlo.ucc.gu.uwa.edu.au"; int giDispensePort = 11020; tItem *gaItems; diff --git a/src/server/server.c b/src/server/server.c index f663ae5..99ea10e 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -238,12 +238,14 @@ void Server_Start(void) { case 0x7F000001: // 127.0.0.1 localhost // case 0x825F0D00: // 130.95.13.0 + case 0x825F0D04: // 130.95.13.4 merlo + case 0x825F0D05: // 130.95.13.5 heathred (MR) case 0x825F0D07: // 130.95.13.7 motsugo case 0x825F0D11: // 130.95.13.17 mermaid case 0x825F0D12: // 130.95.13.18 mussel case 0x825F0D17: // 130.95.13.23 martello case 0x825F0D2A: // 130.95.13.42 meersau - case 0x825F0D42: // 130.95.13.66 heathred + case 0x825F0D42: // 130.95.13.66 heathred (Clubroom) bTrusted = 1; break; default: -- 2.20.1