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

client roles, akimbo pickup fix

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1020 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-05-28 20:30:22 +00:00
parent 5332f5f3fa
commit a7b35fe8a4
12 changed files with 149 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/main.cpp
+5 -4
View File
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
{
bool dedicated = false;
int fs = SDL_FULLSCREEN, depth = 0, bpp = 0, fsaa = 0, par = 0, uprate = 0, maxcl = DEFAULTCLIENTS;
char *sdesc = "", *ip = "", *master = NULL, *passwd = "", *maprot = NULL, *masterpwd = NULL;
char *sdesc = "", *ip = "", *master = NULL, *passwd = "", *maprot = NULL, *adminpwd = NULL, *srvmsg = NULL;
#define initlog(s) puts("init: " s)
initlog("sdl");
@@ -185,8 +185,9 @@ int main(int argc, char **argv)
case 'm': master = a; break;
case 'p': passwd = a; break;
case 'r': maprot = a; break;
case 'x' : masterpwd = a; break; // EDIT: AH
case 'c': maxcl = atoi(a); break; //EDIT: AH
case 'x' : adminpwd = a; break;
case 'c': maxcl = atoi(a); break;
case 'o': srvmsg = a; break;
default: conoutf("unknown commandline option");
}
else conoutf("unknown commandline argument");
@@ -203,7 +204,7 @@ int main(int argc, char **argv)
if(enet_initialize()<0) fatal("Unable to initialise network module");
initclient();
initserver(dedicated, uprate, sdesc, ip, master, passwd, maxcl, maprot, masterpwd); // never returns if dedicated
initserver(dedicated, uprate, sdesc, ip, master, passwd, maxcl, maprot, adminpwd, srvmsg); // never returns if dedicated
initlog("world");
empty_world(7, true);