kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new & extra complicated sendmap handling

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4350 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
ac_stef
2009-04-26 15:13:29 +00:00
parent eb626c4f47
commit 979b04ed05
8 changed files with 256 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/client.cpp
+11 -11
View File
@@ -465,7 +465,7 @@ cvector securemaps;
void resetsecuremaps() { securemaps.deletecontentsa(); }
void securemap(char *map) { if(map) securemaps.add(newstring(map)); }
bool securemapcheck(char *map, bool msg)
bool securemapcheck(const char *map, bool msg)
{
if(strstr(map, "maps/")==map || strstr(map, "maps\\")==map) map += strlen("maps/");
loopv(securemaps) if(!strcmp(securemaps[i], map))
@@ -476,21 +476,15 @@ bool securemapcheck(char *map, bool msg)
return false;
}
void sendmap(char *mapname)
{
if(*mapname && gamemode==1)
{
save_world(mapname);
changemap(mapname); // FIXME!!
}
else mapname = getclientmap();
if(!*mapname) mapname = getclientmap();
if(securemapcheck(mapname)) return;
int mapsize, cfgsize, cfgsizegz;
uchar *mapdata = readmap(path(mapname), &mapsize);
uchar *cfgdata = readmcfggz(path(mapname), &cfgsize, &cfgsizegz);
if(!mapdata) return;
uchar *cfgdata = readmcfggz(path(mapname), &cfgsize, &cfgsizegz);
if(!cfgdata) { cfgsize = 0; cfgsizegz = 0; }
ENetPacket *packet = enet_packet_create(NULL, MAXTRANS + mapsize + cfgsizegz, ENET_PACKET_FLAG_RELIABLE);
@@ -520,8 +514,6 @@ void sendmap(char *mapname)
enet_packet_resize(packet, p.length());
sendpackettoserv(2, packet);
conoutf("sending map %s to server...", mapname);
s_sprintfd(msg)("[map %s uploaded to server, \"/getmap\" to receive it]", mapname);
toserver(msg);
}
void getmap()
@@ -534,6 +526,13 @@ void getmap()
sendpackettoserv(2, packet);
}
void deleteservermap(char *mapname)
{
const char *name = behindpath(mapname);
if(!*name || securemapcheck(name)) return;
addmsg(SV_REMOVEMAP, "rs", name);
}
void getdemo(int i)
{
if(i<=0) conoutf("getting demo...");
@@ -549,6 +548,7 @@ void listdemos()
COMMAND(sendmap, ARG_1STR);
COMMAND(getmap, ARG_NONE);
COMMAND(deleteservermap, ARG_1STR);
COMMAND(resetsecuremaps, ARG_NONE);
COMMAND(securemap, ARG_1STR);
COMMAND(getdemo, ARG_1INT);