From 0ae91ab9aa93762588d4e1cb6de37d08140e6f65 Mon Sep 17 00:00:00 2001 From: driAn Date: Tue, 26 Aug 2008 17:14:31 +0000 Subject: [PATCH] resetsecuremap, fixed spacing git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2391 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/client.cpp | 4 ++-- source/src/server.cpp | 22 +++++++++++----------- source/src/worldio.cpp | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/source/src/client.cpp b/source/src/client.cpp index eff8b5e5..99f08dcc 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -414,7 +414,7 @@ void gets2c() // get updates from the server cvector securemaps; -void clearsecuremaps() { securemaps.deletecontentsa(); } +void resetsecuremaps() { securemaps.deletecontentsa(); } void securemap(char *map) { if(map) securemaps.add(newstring(map)); } bool securemapcheck(char *map, bool msg) { @@ -499,7 +499,7 @@ void listdemos() COMMAND(sendmap, ARG_1STR); COMMAND(getmap, ARG_NONE); -COMMAND(clearsecuremaps, ARG_NONE); +COMMAND(resetsecuremaps, ARG_NONE); COMMAND(securemap, ARG_1STR); COMMAND(getdemo, ARG_1INT); COMMAND(listdemos, ARG_NONE); diff --git a/source/src/server.cpp b/source/src/server.cpp index e3776831..29a73867 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -1058,7 +1058,7 @@ void serverdamage(client *target, client *actor, int damage, int gun, bool gib, target->state.deaths++; if(target!=actor) { - if (!isteam(target->team, actor->team)) actor->state.frags += gib ? 2 : 1; + if(!isteam(target->team, actor->team)) actor->state.frags += gib ? 2 : 1; else { actor->state.frags--; @@ -1147,7 +1147,7 @@ bool updatedescallowed(void) { return servdesc_pre[0] || servdesc_suf[0]; } void updatesdesc(const char *newdesc) { - if (!newdesc || !newdesc[0] || !updatedescallowed()) + if(!newdesc || !newdesc[0] || !updatedescallowed()) { servermsdesc(servdesc_full); } @@ -1195,7 +1195,7 @@ void resetmap(const char *newname, int newmode, int newtime, bool notify) bool lastteammode = m_teammode; smode = newmode; s_strcpy(smapname, newname); - if (isdedicated && smapname[0]) getservermap(); + if(isdedicated && smapname[0]) getservermap(); minremain = newtime >= 0 ? newtime : (m_teammode ? 15 : 10); gamemillis = 0; @@ -1463,14 +1463,14 @@ bool sendmapserv(int n, string mapname, int mapsize, int cfgsize, uchar *data) s_sprintf(name)(SERVERMAP_PATH "incoming/%s.cgz", behindpath(copyname)); path(name); fp = fopen(name, "wb"); - if (fp) + if(fp) { fwrite(copydata, 1, copymapsize, fp); fclose(fp); s_sprintf(name)(SERVERMAP_PATH "incoming/%s.cfg", behindpath(copyname)); path(name); fp = fopen(name, "wb"); - if (fp) + if(fp) { fwrite(copydata + copymapsize, 1, copycfgsize, fp); fclose(fp); @@ -1504,7 +1504,7 @@ void getservermap(void) s_sprintf(cgzname)(SERVERMAP_PATH "%s.cgz", name); path(cgzname); - if (fileexists(cgzname, "r")) + if(fileexists(cgzname, "r")) { s_sprintf(cfgname)(SERVERMAP_PATH "%s.cfg", name); } @@ -1517,9 +1517,9 @@ void getservermap(void) path(cfgname); uchar *cgzdata = (uchar *)loadfile(cgzname, &cgzsize); uchar *cfgdata = (uchar *)loadfile(cfgname, &cfgsize); - if (cgzdata) + if(cgzdata) { - if (!cfgdata) cfgsize = 0; + if(!cfgdata) cfgsize = 0; s_strcpy(copyname, name); copymapsize = cgzsize; copycfgsize = cfgsize; @@ -1954,7 +1954,7 @@ void process(ENetPacket *packet, int sender, int chan) // sender may be -1 p.forceoverread(); break; } - if (sendmapserv(sender, text, mapsize, cfgsize, &p.buf[p.len])) + if(sendmapserv(sender, text, mapsize, cfgsize, &p.buf[p.len])) { logger->writeline(log::info,"[%s] %s sent map %s, %d + %d bytes written", clients[sender]->hostname, clients[sender]->name, text, mapsize, cfgsize); @@ -2263,7 +2263,7 @@ void serverslice(uint timeout) // main server update, called from cube main lo } if(multipleclients) logger->writeline(log::info, "\n"); - if (m_teammode && multipleclients) + if(m_teammode && multipleclients) { cvector teams; @@ -2333,7 +2333,7 @@ void serverslice(uint timeout) // main server update, called from cube main lo c.connectmillis = servmillis; char hn[1024]; s_strcpy(c.hostname, (enet_address_get_host_ip(&c.peer->address, hn, sizeof(hn))==0) ? hn : "unknown"); - loopv(clients) if (clients[i]->type == ST_TCPIP && i != c.clientnum && clients[i]->peer->address.host == c.peer->address.host) clients[i]->awaitdisc = true; + loopv(clients) if(clients[i]->type == ST_TCPIP && i != c.clientnum && clients[i]->peer->address.host == c.peer->address.host) clients[i]->awaitdisc = true; logger->writeline(log::info,"[%s] client connected", c.hostname); break; } diff --git a/source/src/worldio.cpp b/source/src/worldio.cpp index ef8dd96e..8a341416 100644 --- a/source/src/worldio.cpp +++ b/source/src/worldio.cpp @@ -127,7 +127,7 @@ uchar *readmap(char *name, int *size) void writecfg(char *name, int size, uchar *data) { - if (!size) return; + if(!size) return; setnames(name); FILE *f = openfile(mcfname, "w"); if(!f) { conoutf("\f3could not write config to %s", mcfname); return; }