X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=f3f13f38ad9fe59b13d48be47dcbdefe7dc8ff34;hb=80ea2c26461cab2b2992f79643eaf59aacb7cda7;hp=120fa671625b2f4b6836fd624c379918e31d4afd;hpb=f66262ee900f3db4c68d5632fe1bc598cd371edf;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 120fa6716..f3f13f38a 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -58,7 +58,7 @@ float world_initialized; string GetMapname(); string GetGametype(); void GotoNextMap(float reinit); -void ShuffleMaplist() +void ShuffleMaplist(); float(float reinit) DoNextMapOverride; void SetDefaultAlpha() @@ -551,8 +551,10 @@ void spawnfunc___init_dedicated_server(void) self.classname = "worldspawn"; // safeguard against various stuff ;) // needs to be done so early because of the constants they create - RegisterWeapons(); - RegisterGametypes(); + CALL_ACCUMULATED_FUNCTION(RegisterWeapons); + CALL_ACCUMULATED_FUNCTION(RegisterGametypes); + CALL_ACCUMULATED_FUNCTION(RegisterNotifications); + CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes); MapInfo_Enumerate(); MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0); @@ -560,7 +562,6 @@ void spawnfunc___init_dedicated_server(void) void Map_MarkAsRecent(string m); float world_already_spawned; -void RegisterWeapons(); void Nagger_Init(); void ClientInit_Spawn(); void WeaponStats_Init(); @@ -598,8 +599,10 @@ void spawnfunc_worldspawn (void) } // needs to be done so early because of the constants they create - RegisterWeapons(); - RegisterGametypes(); + CALL_ACCUMULATED_FUNCTION(RegisterWeapons); + CALL_ACCUMULATED_FUNCTION(RegisterGametypes); + CALL_ACCUMULATED_FUNCTION(RegisterNotifications); + CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes); ServerProgsDB = db_load(strcat("server.db", autocvar_sessionid)); @@ -670,9 +673,6 @@ void spawnfunc_worldspawn (void) WaypointSprite_Init(); - //if (g_domination) - // dom_init(); - GameLogInit(); // prepare everything // NOTE for matchid: // changing the logic generating it is okay. But: @@ -827,15 +827,18 @@ void spawnfunc_worldspawn (void) addstat(STAT_MOVEVARS_MAXSPEED, AS_FLOAT, stat_sv_maxspeed); addstat(STAT_MOVEVARS_AIRACCEL_QW, AS_FLOAT, stat_sv_airaccel_qw); addstat(STAT_MOVEVARS_AIRSTRAFEACCEL_QW, AS_FLOAT, stat_sv_airstrafeaccel_qw); - + // secrets addstat(STAT_SECRETS_TOTAL, AS_FLOAT, stat_secrets_total); addstat(STAT_SECRETS_FOUND, AS_FLOAT, stat_secrets_found); - + + // misc + addstat(STAT_RESPAWN_TIME, AS_FLOAT, stat_respawn_time); + next_pingtime = time + 5; detect_maptype(); - + // set up information replies for clients and server to use lsmaps_reply = "^7Maps available: "; lsnewmaps_reply = "^7Maps without a record set: "; @@ -848,18 +851,18 @@ void spawnfunc_worldspawn (void) col = "^2"; else col = "^3"; - + ++j; - + lsmaps_reply = strcat(lsmaps_reply, col, MapInfo_Map_bspname, " "); - + if(g_race && !stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, RACE_RECORD, "time")))) lsnewmaps_reply = strcat(lsnewmaps_reply, col, MapInfo_Map_bspname, " "); else if(g_cts && !stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, CTS_RECORD, "time")))) lsnewmaps_reply = strcat(lsnewmaps_reply, col, MapInfo_Map_bspname, " "); } } - + lsmaps_reply = strzone(strcat(lsmaps_reply, "\n")); lsnewmaps_reply = strzone(strcat(((!g_race && !g_cts) ? "Need to be playing race or CTS for lsnewmaps to work." : lsnewmaps_reply), "\n")); @@ -882,9 +885,11 @@ void spawnfunc_worldspawn (void) for(i = 0; i < 10; ++i) { - records_reply[i] = strzone(getrecords(i)); + s = getrecords(i); + if (s) + records_reply[i] = strzone(s); } - + ladder_reply = strzone(getladder()); rankings_reply = strzone(getrankings()); @@ -1343,10 +1348,10 @@ float mapvote_initialized; void IntermissionThink() { FixIntermissionClient(self); - + float server_screenshot = (autocvar_sv_autoscreenshot && self.cvar_cl_autoscreenshot); float client_screenshot = (self.cvar_cl_autoscreenshot == 2); - + if( (server_screenshot || client_screenshot) && ((self.autoscreenshot > 0) && (time > self.autoscreenshot)) ) { @@ -1609,6 +1614,8 @@ void NextLevel() if(autocvar_g_campaign) CampaignPreIntermission(); + MUTATOR_CALLHOOK(MatchEnd); + localcmd("\nsv_hook_gameend\n"); } @@ -1755,10 +1762,10 @@ float WinningCondition_Onslaught() { if (head.health > 0) { - if (head.team == COLOR_TEAM1) t1 = 1; - if (head.team == COLOR_TEAM2) t2 = 1; - if (head.team == COLOR_TEAM3) t3 = 1; - if (head.team == COLOR_TEAM4) t4 = 1; + if (head.team == FL_TEAM_1) t1 = 1; + if (head.team == FL_TEAM_2) t2 = 1; + if (head.team == FL_TEAM_3) t3 = 1; + if (head.team == FL_TEAM_4) t4 = 1; } head = find(head, classname, "onslaught_generator"); } @@ -1766,10 +1773,10 @@ float WinningCondition_Onslaught() { // game over, only one team remains (or none) ClearWinners(); - if (t1) SetWinners(team, COLOR_TEAM1); - if (t2) SetWinners(team, COLOR_TEAM2); - if (t3) SetWinners(team, COLOR_TEAM3); - if (t4) SetWinners(team, COLOR_TEAM4); + if (t1) SetWinners(team, FL_TEAM_1); + if (t2) SetWinners(team, FL_TEAM_2); + if (t3) SetWinners(team, FL_TEAM_3); + if (t4) SetWinners(team, FL_TEAM_4); dprint("Have a winner, ending game.\n"); return WINNING_YES; } @@ -1807,13 +1814,13 @@ float WinningCondition_Assault() status = WINNING_NO; // as the timelimit has not yet passed just assume the defending team will win - if(assault_attacker_team == COLOR_TEAM1) + if(assault_attacker_team == FL_TEAM_1) { - SetWinners(team, COLOR_TEAM2); + SetWinners(team, FL_TEAM_2); } else { - SetWinners(team, COLOR_TEAM1); + SetWinners(team, FL_TEAM_1); } entity ent; @@ -1939,10 +1946,10 @@ float WinningCondition_Scores(float limit, float leadlimit) if(teamplay) { - team1_score = TeamScore_GetCompareValue(COLOR_TEAM1); - team2_score = TeamScore_GetCompareValue(COLOR_TEAM2); - team3_score = TeamScore_GetCompareValue(COLOR_TEAM3); - team4_score = TeamScore_GetCompareValue(COLOR_TEAM4); + team1_score = TeamScore_GetCompareValue(FL_TEAM_1); + team2_score = TeamScore_GetCompareValue(FL_TEAM_2); + team3_score = TeamScore_GetCompareValue(FL_TEAM_3); + team4_score = TeamScore_GetCompareValue(FL_TEAM_4); } ClearWinners(); @@ -2025,7 +2032,6 @@ float WinningCondition_Race(float fraglimit) return WINNING_STARTSUDDENDEATHOVERTIME; else return WINNING_NEVER; - return wc; } float WinningCondition_QualifyingThenRace(float limit) @@ -2059,25 +2065,25 @@ float WinningCondition_RanOutOfSpawns() FOR_EACH_PLAYER(head) if(head.deadflag == DEAD_NO) { - if(head.team == COLOR_TEAM1) + if(head.team == FL_TEAM_1) team1_score = 1; - else if(head.team == COLOR_TEAM2) + else if(head.team == FL_TEAM_2) team2_score = 1; - else if(head.team == COLOR_TEAM3) + else if(head.team == FL_TEAM_3) team3_score = 1; - else if(head.team == COLOR_TEAM4) + else if(head.team == FL_TEAM_4) team4_score = 1; } for(head = world; (head = find(head, classname, "info_player_deathmatch")) != world; ) { - if(head.team == COLOR_TEAM1) + if(head.team == FL_TEAM_1) team1_score = 1; - else if(head.team == COLOR_TEAM2) + else if(head.team == FL_TEAM_2) team2_score = 1; - else if(head.team == COLOR_TEAM3) + else if(head.team == FL_TEAM_3) team3_score = 1; - else if(head.team == COLOR_TEAM4) + else if(head.team == FL_TEAM_4) team4_score = 1; } @@ -2091,20 +2097,20 @@ float WinningCondition_RanOutOfSpawns() { float t, i; if(team1_score) - t = COLOR_TEAM1; + t = FL_TEAM_1; else if(team2_score) - t = COLOR_TEAM2; + t = FL_TEAM_2; else if(team3_score) - t = COLOR_TEAM3; + t = FL_TEAM_3; else // if(team4_score) - t = COLOR_TEAM4; + t = FL_TEAM_4; CheckAllowedTeams(world); for(i = 0; i < MAX_TEAMSCORE; ++i) { - if(t != COLOR_TEAM1) if(c1 >= 0) TeamScore_AddToTeam(COLOR_TEAM1, i, -1000); - if(t != COLOR_TEAM2) if(c2 >= 0) TeamScore_AddToTeam(COLOR_TEAM2, i, -1000); - if(t != COLOR_TEAM3) if(c3 >= 0) TeamScore_AddToTeam(COLOR_TEAM3, i, -1000); - if(t != COLOR_TEAM4) if(c4 >= 0) TeamScore_AddToTeam(COLOR_TEAM4, i, -1000); + if(t != FL_TEAM_1) if(c1 >= 0) TeamScore_AddToTeam(FL_TEAM_1, i, -1000); + if(t != FL_TEAM_2) if(c2 >= 0) TeamScore_AddToTeam(FL_TEAM_2, i, -1000); + if(t != FL_TEAM_3) if(c3 >= 0) TeamScore_AddToTeam(FL_TEAM_3, i, -1000); + if(t != FL_TEAM_4) if(c4 >= 0) TeamScore_AddToTeam(FL_TEAM_4, i, -1000); } AddWinners(team, t); @@ -2345,7 +2351,7 @@ string MapVote_Suggest(string m) if(mapvote_initialized) return "Can't suggest - voting is already in progress!"; m = MapInfo_FixName(m); - if(!m) + if not(m) return "The map you suggested is not available on this server."; if(!autocvar_g_maplist_votable_suggestions_override_mostrecent) if(Map_IsRecent(m))