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

allow only matching mode/map combinations for non-admins

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3996 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
ac_stef
2008-12-11 15:49:59 +00:00
parent db6fc3ca8d
commit ad399ea13a
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/server.cpp
+2 -2
View File
@@ -3033,7 +3033,7 @@ void process(ENetPacket *packet, int sender, int chan) // sender may be -1
filtertext(text, text);
int mode = getint(p);
if(mode==GMODE_DEMO) vi->action = new demoplayaction(text);
else vi->action = new mapaction(newstring(text), mode);
else vi->action = new mapaction(newstring(text), mode, sender);
break;
}
case SA_KICK:
@@ -3055,7 +3055,7 @@ void process(ENetPacket *packet, int sender, int chan) // sender may be -1
vi->action = new shuffleteamaction();
break;
case SA_FORCETEAM:
vi->action = new forceteamaction(getint(p));
vi->action = new forceteamaction(getint(p), sender);
break;
case SA_GIVEADMIN:
vi->action = new giveadminaction(getint(p));
source/src/serveractions.h
+25 -17
View File
@@ -3,7 +3,7 @@
enum { EE_LOCAL_SERV = 1, EE_DED_SERV = 1<<1 }; // execution environment
int roleconf(int key)
{
{ // current defaults: "fGkBMasRCDxP"
if(strchr(voteperm, tolower(key))) return CR_DEFAULT;
if(strchr(voteperm, toupper(key))) return CR_ADMIN;
return (key) == tolower(key) ? CR_DEFAULT : CR_ADMIN;
@@ -41,27 +41,34 @@ struct mapaction : serveraction
}
bool isvalid() { return serveraction::isvalid() && mode != GMODE_DEMO && map[0]; }
bool isdisabled() { return configsets.inrange(curcfgset) && !configsets[curcfgset].vote; }
mapaction(char *map, int mode) : map(map), mode(mode)
mapaction(char *map, int mode, int caller) : map(map), mode(mode)
{
if(strchr(voteperm, 'X')) // admin needed for new maps
if(isdedicated)
{
const char *name = behindpath(map);
s_sprintfd(cgzname)(SERVERMAP_PATH "%s.cgz", name);
path(cgzname);
bool found = fileexists(cgzname, "r");
if(!found)
bool notify = valid_client(caller) && clients[caller]->role == CR_DEFAULT;
mapstats *ms = getservermapstats(map);
if(strchr(voteperm, 'X') && !ms) // admin needed for unknown maps
{
s_sprintfd(cgzname)(SERVERMAP_PATH_INCOMING "%s.cgz", name);
path(cgzname);
found = fileexists(cgzname, "r");
if(!found)
role = CR_ADMIN;
if(notify) sendservmsg("the server does not have this map", caller);
}
if(ms && !strchr(voteperm, 'p')) // admin needed for mismatched modes
{
int smode = mode; // 'borrow' the mode macros by replacing a global by a local var
bool spawns = (m_teammode && !m_ktf) ? ms->hasteamspawns : ms->hasffaspawns;
bool flags = m_flags && !m_htf ? ms->hasflags : true;
if(!spawns || !flags)
{
s_sprintfd(cgzname)(SERVERMAP_PATH_BUILTIN "%s.cgz", name);
path(cgzname);
found = fileexists(cgzname, "r");
role = CR_ADMIN;
s_sprintfd(msg)("\f3map \"%s\" does not support \"%s\": ", behindpath(map), modestr(mode, false));
if(!spawns) s_strcat(msg, "player spawns");
if(!spawns && !flags) s_strcat(msg, " and ");
if(!flags) s_strcat(msg, "flag bases");
s_strcat(msg, " missing");
if(notify) sendservmsg(msg, caller);
logger->writeline(log::info, "%s", msg);
}
}
if(!found) role = CR_ADMIN;
}
area |= EE_LOCAL_SERV; // local too
s_sprintf(desc)("load map '%s' in mode '%s'", map, modestr(mode));
@@ -101,8 +108,9 @@ struct forceteamaction : playeraction
{
void perform() { forceteam(cn, team_opposite(team_int(clients[cn]->team)), true); }
virtual bool isvalid() { return m_teammode && valid_client(cn); }
forceteamaction(int cn) : playeraction(cn)
forceteamaction(int cn, int caller) : playeraction(cn)
{
if(cn != caller) role = roleconf('f');
if(isvalid()) s_sprintf(desc)("force player %s to the enemy team", clients[cn]->name);
}
};