X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=c8405e0a01e45c72f65f96d6c85ab89153b4268d;hp=038936ee49282bff375700dd76159197aea86d8f;hb=275db1b1d382ef40155eeb44fae62ae5f1087029;hpb=70bba988cd32922d29e40235db6ad1d8149bdc67 diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 038936ee4..c8405e0a0 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -265,6 +265,7 @@ void cvar_changes_init() BADCVAR("g_dm"); BADCVAR("g_domination"); BADCVAR("g_domination_default_teams"); + BADCVAR("g_duel"); BADCVAR("g_freezetag"); BADCVAR("g_freezetag_teams"); BADCVAR("g_invasion_teams"); @@ -430,6 +431,7 @@ void cvar_changes_init() BADCVAR("log_file"); BADCVAR("maxplayers"); BADCVAR("minplayers"); + BADCVAR("minplayers_per_team"); BADCVAR("net_address"); BADCVAR("port"); BADCVAR("rcon_password"); @@ -472,6 +474,12 @@ void cvar_changes_init() BADCVAR("g_grappling_hook"); BADCVAR("g_jetpack"); + // temporary for testing + // TODO remove before 0.8.3 release + BADCVAR("g_ca_weaponarena"); + BADCVAR("g_freezetag_weaponarena"); + BADCVAR("g_lms_weaponarena"); + #undef BADPRESUFFIX #undef BADPREFIX #undef BADCVAR @@ -614,10 +622,12 @@ void InitGameplayMode() world.fog = string_null; } if(MapInfo_Map_fog != "") + { if(MapInfo_Map_fog == "none") world.fog = string_null; else world.fog = strzone(MapInfo_Map_fog); + } clientstuff = strzone(MapInfo_Map_clientstuff); MapInfo_ClearTemps(); @@ -636,7 +646,7 @@ spawnfunc(worldspawn) { server_is_dedicated = boolean(stof(cvar_defstring("is_dedicated"))); - bool wantrestart = false; + bool wantrestart = false; { if (!server_is_dedicated) { @@ -691,7 +701,7 @@ spawnfunc(worldspawn) } if (wantrestart) { - LOG_INFOF("Restart requested"); + LOG_INFO("Restart requested"); changelevel(mapname); // let initialization continue, shutdown depends on it } @@ -770,7 +780,7 @@ spawnfunc(worldspawn) readlevelcvars(); GrappleHookInit(); - GameRules_limit_fallbacks(); + GameRules_limit_fallbacks(); if(warmup_limit == 0) warmup_limit = (autocvar_timelimit > 0) ? autocvar_timelimit * 60 : autocvar_timelimit; @@ -856,8 +866,14 @@ spawnfunc(worldspawn) continue; if(argv(0) == "cd") { + string trackname = argv(2); LOG_INFO("Found ^1UNSUPPORTED^7 cd loop command in .cfg file; put this line in mapinfo instead:"); - LOG_INFO(" cdtrack ", argv(2)); + LOG_INFO(" cdtrack ", trackname); + if (cvar_value_issafe(trackname)) + { + string newstuff = strcat(clientstuff, "cd loop \"", trackname, "\"\n"); + strcpy(clientstuff, newstuff); + } } else if(argv(0) == "fog") { @@ -921,7 +937,7 @@ spawnfunc(worldspawn) s = cons(s, pkg); } // add automatically managed files to the list - #define X(match) MACRO_BEGIN { \ + #define X(match) MACRO_BEGIN \ int fd = search_begin(match, true, false); \ if (fd >= 0) \ { \ @@ -931,7 +947,7 @@ spawnfunc(worldspawn) } \ search_end(fd); \ } \ - } MACRO_END + MACRO_END X("*-serverpackage.txt"); X("*.serverpackage"); #undef X @@ -980,22 +996,27 @@ float Map_Count, Map_Current; string Map_Current_Name; // NOTE: this now expects the map list to be already tokenized and the count in Map_Count -float GetMaplistPosition() +int GetMaplistPosition() { - float pos, idx; - string map; - - map = GetMapname(); - idx = autocvar_g_maplist_index; + string map = GetMapname(); + int idx = autocvar_g_maplist_index; if(idx >= 0) + { if(idx < Map_Count) + { if(map == argv(idx)) + { return idx; + } + } + } - for(pos = 0; pos < Map_Count; ++pos) + for(int pos = 0; pos < Map_Count; ++pos) + { if(map == argv(pos)) return pos; + } // resume normal maplist rotation if current map is not in g_maplist return idx; @@ -1003,8 +1024,11 @@ float GetMaplistPosition() bool MapHasRightSize(string map) { - if(currentbots || autocvar_bot_number || player_count < autocvar_minplayers) - if(autocvar_g_maplist_check_waypoints) + int minplayers = max(0, floor(autocvar_minplayers)); + if (teamplay) + minplayers = max(0, floor(autocvar_minplayers_per_team) * AvailableTeams()); + if (autocvar_g_maplist_check_waypoints + && (currentbots || autocvar_bot_number || player_count < minplayers)) { string checkwp_msg = strcat("checkwp ", map); if(!fexists(strcat("maps/", map, ".waypoints"))) @@ -1015,6 +1039,9 @@ bool MapHasRightSize(string map) LOG_TRACE(checkwp_msg, ": has waypoints"); } + if(autocvar_g_maplist_ignore_sizes) + return true; + // open map size restriction file string opensize_msg = strcat("opensize ", map); float fh = fopen(strcat("maps/", map, ".sizes"), FILE_READ); @@ -1192,18 +1219,25 @@ float MaplistMethod_Shuffle(float exponent) // more clever shuffling void Maplist_Init() { - Map_Count = tokenizebyseparator(autocvar_g_maplist, " "); - float i; - for (i = 0; i < Map_Count; ++i) - if (Map_Check(i, 2)) - break; + float i = Map_Count = 0; + if(autocvar_g_maplist != "") + { + Map_Count = tokenizebyseparator(autocvar_g_maplist, " "); + for (i = 0; i < Map_Count; ++i) + { + if (Map_Check(i, 2)) + break; + } + } + if (i == Map_Count) { bprint( "Maplist contains no usable maps! Resetting it to default map list.\n" ); cvar_set("g_maplist", MapInfo_ListAllAllowedMaps(MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags() | MAPINFO_FLAG_NOAUTOMAPLIST)); if(autocvar_g_maplist_shuffle) ShuffleMaplist(); - localcmd("\nmenu_cmd sync\n"); + if(!server_is_dedicated) + localcmd("\nmenu_cmd sync\n"); Map_Count = tokenizebyseparator(autocvar_g_maplist, " "); } if(Map_Count == 0) @@ -1217,10 +1251,8 @@ void Maplist_Init() string GetNextMap() { - float nextMap; - Maplist_Init(); - nextMap = -1; + float nextMap = -1; if(nextMap == -1) if(autocvar_g_maplist_shuffle > 0) @@ -1315,9 +1347,7 @@ void GotoNextMap(float reinit) return; alreadychangedlevel = true; - string nextMap; - - nextMap = GetNextMap(); + string nextMap = GetNextMap(); if(nextMap == "") error("Everything is broken - cannot find a next map. Please report this to the developers."); Map_Goto(reinit); @@ -1520,7 +1550,7 @@ void FixIntermissionClient(entity e) if(!e.autoscreenshot) // initial call { e.autoscreenshot = time + 0.8; // used for autoscreenshot - SetResourceAmountExplicit(e, RESOURCE_HEALTH, -2342); + SetResourceExplicit(e, RES_HEALTH, -2342); // first intermission phase; voting phase has positive health (used to decide whether to send SVC_FINALE or not) for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { @@ -1611,7 +1641,9 @@ float InitiateSuddenDeath() // - for this timelimit_overtime needs to be >0 of course // - also check the winning condition calculated in the previous frame and only add normal overtime // again, if at the point at which timelimit would be extended again, still no winner was found - if (!autocvar_g_campaign && (checkrules_overtimesadded >= 0) && (checkrules_overtimesadded < autocvar_timelimit_overtimes || autocvar_timelimit_overtimes < 0) && autocvar_timelimit_overtime && !(g_race && !g_race_qualifying)) + if (!autocvar_g_campaign && checkrules_overtimesadded >= 0 + && (checkrules_overtimesadded < autocvar_timelimit_overtimes || autocvar_timelimit_overtimes < 0) + && autocvar_timelimit_overtime && !(g_race && !g_race_qualifying)) { return 1; // need to call InitiateOvertime later } @@ -1634,33 +1666,36 @@ void InitiateOvertime() // ONLY call this if InitiateSuddenDeath returned true { ++checkrules_overtimesadded; //add one more overtime by simply extending the timelimit - float tl; - tl = autocvar_timelimit; - tl += autocvar_timelimit_overtime; - cvar_set("timelimit", ftos(tl)); - + cvar_set("timelimit", ftos(autocvar_timelimit + autocvar_timelimit_overtime)); Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_OVERTIME_TIME, autocvar_timelimit_overtime * 60); } float GetWinningCode(float fraglimitreached, float equality) { if(autocvar_g_campaign == 1) + { if(fraglimitreached) return WINNING_YES; else return WINNING_NO; - + } else + { if(equality) + { if(fraglimitreached) return WINNING_STARTSUDDENDEATHOVERTIME; else return WINNING_NEVER; + } else + { if(fraglimitreached) return WINNING_YES; else return WINNING_NO; + } + } } // set the .winning flag for exactly those players with a given field value @@ -1730,19 +1765,20 @@ float WinningCondition_Scores(float limit, float leadlimit) leaderfrags = WinningConditionHelper_topscore; if (limit) - if (leaderfrags == limit - 1) - Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_1); - else if (leaderfrags == limit - 2) - Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_2); - else if (leaderfrags == limit - 3) - Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_3); + { + if (leaderfrags == limit - 1) + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_1); + else if (leaderfrags == limit - 2) + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_2); + else if (leaderfrags == limit - 3) + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_3); + } } } limitreached = false; - if(limit) - if(WinningConditionHelper_topscore >= limit) - limitreached = true; + if (limit && WinningConditionHelper_topscore >= limit) + limitreached = true; if(leadlimit) { float leadlimitreached; @@ -1777,7 +1813,7 @@ float WinningCondition_RanOutOfSpawns() { Team_SetTeamScore(Team_GetTeamFromIndex(i), 0); } - + FOREACH_CLIENT(IS_PLAYER(it) && !IS_DEAD(it), { if (Team_IsValidTeam(it.team))