no message
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1031 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
+6
-5
@@ -161,7 +161,7 @@ VARF(gamespeed, 10, 100, 1000, if(multiplayer()) gamespeed = 100);
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
bool dedicated = false;
|
||||
int fs = SDL_FULLSCREEN, depth = 0, bpp = 0, fsaa = 0, vsync = -1, par = 0, uprate = 0, maxcl = DEFAULTCLIENTS;
|
||||
int fs = SDL_FULLSCREEN, depth = 0, bpp = 0, fsaa = 0, vsync = -1, par = 0, uprate = 0, maxcl = DEFAULTCLIENTS, tkthreshold = 2;
|
||||
char *sdesc = "", *ip = "", *master = NULL, *passwd = "", *maprot = NULL, *adminpwd = NULL, *srvmsg = NULL;
|
||||
|
||||
#define initlog(s) puts("init: " s)
|
||||
@@ -189,6 +189,7 @@ int main(int argc, char **argv)
|
||||
case 'x' : adminpwd = a; break;
|
||||
case 'c': maxcl = atoi(a); break;
|
||||
case 'o': srvmsg = a; break;
|
||||
case 'k': tkthreshold = atoi(a); break;
|
||||
default: conoutf("unknown commandline option");
|
||||
}
|
||||
else conoutf("unknown commandline argument");
|
||||
@@ -205,7 +206,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, adminpwd, srvmsg); // never returns if dedicated
|
||||
initserver(dedicated, uprate, sdesc, ip, master, passwd, maxcl, maprot, adminpwd, srvmsg, tkthreshold); // never returns if dedicated
|
||||
|
||||
initlog("world");
|
||||
empty_world(7, true);
|
||||
@@ -256,9 +257,9 @@ int main(int argc, char **argv)
|
||||
|
||||
initlog("cfg");
|
||||
extern void *scoremenu, *teammenu, *ctfmenu, *servmenu, *kickmenu, *banmenu, *docmenu;
|
||||
scoremenu = addmenu("score", "frags\tpj\tping\tname\tcn", false, renderscores);
|
||||
teammenu = addmenu("team score", "frags\tpj\tping\tteam\tname\tcn", false, renderscores);
|
||||
ctfmenu = addmenu("ctf score", "flags\tfrags\tpj\tping\tteam\tname\tcn", false, renderscores);
|
||||
scoremenu = addmenu("score", "frags\tdeaths\tpj\tping\tname\tcn", false, renderscores);
|
||||
teammenu = addmenu("team score", "frags\tdeaths\tpj\tping\tteam\tname\tcn", false, renderscores);
|
||||
ctfmenu = addmenu("ctf score", "flags\tdeaths\tfrags\tpj\tping\tteam\tname\tcn", false, renderscores);
|
||||
servmenu = addmenu("server", "ping\tplr\tserver", true, refreshservers);
|
||||
kickmenu = addmenu("kick player", NULL, true, refreshmastermenu);
|
||||
banmenu = addmenu("ban player", NULL, true, refreshmastermenu);
|
||||
|
||||
Reference in New Issue
Block a user