X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=9ef72ae832352149d3dce0b2dc11253774218bbf;hp=f66ebcb0eed04adfb8ccd36e064d66b1eb4e61e4;hb=45d8904a100765555e622598a39967963733df1d;hpb=4c659ff902dd85a9eceb9e2af9e3e8121985a230 diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index f66ebcb0e..9ef72ae83 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -16,6 +16,7 @@ #include #include "race.qh" #include "scores.qh" +#include "scores_rules.qh" #include "teamplay.qh" #include "weapons/weaponstats.qh" #include "../common/constants.qh" @@ -264,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"); @@ -356,6 +358,7 @@ void cvar_changes_init() BADCVAR("sv_stepheight"); BADCVAR("sv_timeout"); BADCVAR("sv_weapons_modeloverride"); + BADCVAR("w_prop_interval"); BADPREFIX("crypto_"); BADPREFIX("gameversion_"); BADPREFIX("g_chat_"); @@ -428,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"); @@ -612,10 +616,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(); @@ -634,7 +640,7 @@ spawnfunc(worldspawn) { server_is_dedicated = boolean(stof(cvar_defstring("is_dedicated"))); - bool wantrestart = false; + bool wantrestart = false; { if (!server_is_dedicated) { @@ -689,7 +695,7 @@ spawnfunc(worldspawn) } if (wantrestart) { - LOG_INFOF("Restart requested"); + LOG_INFO("Restart requested"); changelevel(mapname); // let initialization continue, shutdown depends on it } @@ -768,7 +774,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; @@ -919,7 +925,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) \ { \ @@ -929,7 +935,7 @@ spawnfunc(worldspawn) } \ search_end(fd); \ } \ - } MACRO_END + MACRO_END X("*-serverpackage.txt"); X("*.serverpackage"); #undef X @@ -1001,8 +1007,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"))) @@ -1518,7 +1527,7 @@ void FixIntermissionClient(entity e) if(!e.autoscreenshot) // initial call { e.autoscreenshot = time + 0.8; // used for autoscreenshot - e.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) { @@ -1609,7 +1618,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 } @@ -1632,33 +1643,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 @@ -1728,19 +1742,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; @@ -1775,7 +1790,7 @@ float WinningCondition_RanOutOfSpawns() { Team_SetTeamScore(Team_GetTeamFromIndex(i), 0); } - + FOREACH_CLIENT(IS_PLAYER(it) && !IS_DEAD(it), { if (Team_IsValidTeam(it.team))