X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=f72d32236ffd880a0ba47ed3c6e919bf3846689a;hp=db5c360945f6c3e763716301819e926bb3d7f590;hb=84de176ec42eeaeaa7f9b415b0f2b67adb1aa708;hpb=a44a5ef987ba2b48e29d3aff2ee4bc83757e7b8d

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index db5c360945..f72d32236f 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -329,6 +329,7 @@ void cvar_changes_init()
 		BADCVAR("g_runematch");
 		BADCVAR("g_tdm");
 		BADCVAR("g_nexball");
+		BADCVAR("g_keepaway");
 		BADCVAR("teamplay");
 
 		// long
@@ -427,6 +428,7 @@ void cvar_changes_init()
 		BADCVAR("sv_autoscreenshot");
 		BADCVAR("sv_curl_defaulturl");
 		BADCVAR("sv_defaultcharacter");
+		BADCVAR("sv_defaultplayercolors");
 		BADCVAR("sv_defaultplayermodel");
 		BADCVAR("sv_defaultplayerskin");
 		BADCVAR("sv_maxidle");
@@ -800,14 +802,13 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_INVINCIBLE_FINISHED, AS_FLOAT, invincible_finished);
 	addstat(STAT_PRESSED_KEYS, AS_FLOAT, pressedkeys);
 	addstat(STAT_FUEL, AS_INT, ammo_fuel);
-	addstat(STAT_DAMAGE_HITS, AS_INT, stat_hit);
-	addstat(STAT_DAMAGE_FIRED, AS_INT, stat_fired);
 	addstat(STAT_SHOTORG, AS_INT, stat_shotorg);
 	addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
 	addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);
 	addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
 
 	addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
+	addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_charge_pool_ammo);
 
 	if(g_ca || g_freezetag)
 	{
@@ -816,8 +817,15 @@ void spawnfunc_worldspawn (void)
 		addstat(STAT_YELLOWALIVE, AS_INT, yellowalive_stat);
 		addstat(STAT_PINKALIVE, AS_INT, pinkalive_stat);
 	}
+	if(g_freezetag)
+	{
+		addstat(STAT_FROZEN, AS_INT, freezetag_frozen);
+		addstat(STAT_REVIVE_PROGRESS, AS_FLOAT, freezetag_revive_progress);
+	}
+
 	// g_movementspeed hack
 	addstat(STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW, AS_FLOAT, stat_sv_airspeedlimit_nonqw);
+	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);
 
@@ -898,6 +906,8 @@ void spawnfunc_worldspawn (void)
 		cvar_set("sv_curl_serverpackages", substring(s, 1, -1));
 	}
 
+	PlayerStats_Init();
+
 	world_initialized = 1;
 }
 
@@ -1398,12 +1408,13 @@ RULES
 
 void DumpStats(float final)
 {
-	local float file;
-	local string s;
-	local float to_console;
-	local float to_eventlog;
-	local float to_file;
-	local float i;
+	float file;
+	string s;
+	float to_console;
+	float to_eventlog;
+	float to_file;
+	float i;
+	entity e;
 
 	to_console = cvar("sv_logscores_console");
 	to_eventlog = cvar("sv_eventlog");
@@ -1498,6 +1509,11 @@ void DumpStats(float final)
 		fputs(file, ":end\n");
 		fclose(file);
 	}
+
+	// send statistics
+	FOR_EACH_CLIENT(e)
+		PlayerStats_AddGlobalInfo(e);
+	PlayerStats_Shutdown();
 }
 
 void FixIntermissionClient(entity e)
@@ -1543,8 +1559,6 @@ only called if a time or frag limit has expired
 */
 void NextLevel()
 {
-	float i;
-
 	gameover = TRUE;
 
 	intermission_running = 1;
@@ -1573,52 +1587,10 @@ void NextLevel()
 
 	GameLogClose();
 
-// TO DO
-
-// save the stats to a text file on the client
-// stuffcmd(other, log_stats "stats/file_name");
-// bprint stats
-// stuffcmd(other, log_stats "");
-// use a filename similar to the demo name
-	// string file_name;
-	// file_name = strcat("\nlog_file \"stats/", strftime(TRUE, "%Y-%m-%d_%H-%M"), "_", mapname, ".txt\"");  // open the log file
-
-// write a stats parser for the menu
-
-	if(cvar("sv_accuracy_data_send")) {
-		string stats_to_send;
-
-		FOR_EACH_CLIENT(other) {  // make the string to send
-			FixIntermissionClient(other);
-
-			if(other.cvar_cl_accuracy_data_share) {
-				stats_to_send = strcat(stats_to_send, ":hits:", other.netname);
-
-				for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-					stats_to_send = strcat(stats_to_send, ":", ftos(other.stats_hit[i-1]));
-
-				stats_to_send = strcat(stats_to_send, "\n:fired:", other.netname);
-
-				for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-					stats_to_send = strcat(stats_to_send, ":", ftos(other.stats_fired[i-1]));
-
-				stats_to_send = strcat(stats_to_send, "\n");
-			}
-		}
-
-		FOR_EACH_REALCLIENT(other) {  // only spam humans
-			Score_NicePrint(other);  // print the score
-
-			if(other.cvar_cl_accuracy_data_receive)  // send the stats string to all the willing clients
-				bprint(stats_to_send);
-		}
-	} else { // ye olde message
-		FOR_EACH_PLAYER(other) {
-			FixIntermissionClient(other);
-
-			if(other.winning)
-				bprint(other.netname, " ^7wins.\n");
-		}
+	FOR_EACH_PLAYER(other) {
+		FixIntermissionClient(other);
+		if(other.winning)
+			bprint(other.netname, " ^7wins.\n");
 	}
 
 	if(cvar("g_campaign"))
@@ -2763,6 +2735,10 @@ void MapVote_Start()
 	if(mapvote_run)
 		return;
 
+	// wait for stats to be sent first
+	if(!playerstats_sent)
+		return;
+
 	MapInfo_Enumerate();
 	if(MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 1))
 		mapvote_run = TRUE;
@@ -2937,6 +2913,8 @@ void RestoreGame()
 
 void SV_Shutdown()
 {
+	entity e;
+
 	if(gameover > 1) // shutting down already?
 		return;
 
@@ -2947,6 +2925,11 @@ void SV_Shutdown()
 		world_initialized = 0;
 		print("Saving persistent data...\n");
 		Ban_SaveBans();
+
+		FOR_EACH_CLIENT(e)
+			PlayerStats_AddGlobalInfo(e);
+		PlayerStats_Shutdown();
+
 		if(!cheatcount_total)
 		{
 			if(cvar("sv_db_saveasdump"))