X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fplayerstats.qc;h=7584e3353c081c50fe7768682f81ec871d5e08d5;hp=e46e12fa1eeb6ac7053fda8b6365599e2f18bebd;hb=e9f30b97435c6afe3d6911f21e1f4fd1b97e93da;hpb=fc62dfa34fa5b13d63660d5249633af1222d6476 diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index e46e12fa1..7584e3353 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -1,11 +1,8 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../dpdefs/progsdefs.qh" - #include "../dpdefs/dpextensions.qh" #include "constants.qh" #include "util.qh" - #include "urllib.qh" #include "weapons/all.qh" #include "../server/weapons/accuracy.qh" #include "../server/defs.qh" @@ -14,7 +11,7 @@ #endif #ifdef SVQC -void PlayerStats_Prematch(void) +void PlayerStats_Prematch() { //foobar } @@ -395,9 +392,9 @@ void PlayerStats_GameReport_Handler(entity fh, entity pass, float status) { // url_fclose is processing, we got a response for writing the data // this must come from HTTP - dprint("Got response from player stats server:\n"); - while((s = url_fgets(fh))) { dprint(" ", s, "\n"); } - dprint("End of response.\n"); + LOG_TRACE("Got response from player stats server:\n"); + while((s = url_fgets(fh))) { LOG_TRACE(" ", s, "\n"); } + LOG_TRACE("End of response.\n"); url_fclose(fh); break; } @@ -405,7 +402,7 @@ void PlayerStats_GameReport_Handler(entity fh, entity pass, float status) case URL_READY_CLOSED: { // url_fclose has finished - dprint("Player stats written\n"); + LOG_TRACE("Player stats written\n"); PlayerStats_GameReport_DelayMapVote = false; if(PS_GR_OUT_DB >= 0) { @@ -418,7 +415,7 @@ void PlayerStats_GameReport_Handler(entity fh, entity pass, float status) case URL_READY_ERROR: default: { - print("Player stats writing failed: ", ftos(status), "\n"); + LOG_INFO("Player stats writing failed: ", ftos(status), "\n"); PlayerStats_GameReport_DelayMapVote = false; if(PS_GR_OUT_DB >= 0) { @@ -444,7 +441,7 @@ void PlayerStats_PlayerBasic(entity joiningplayer, float newrequest) // now request the information uri = strcat(uri, "/player/", uri_escape(uri_escape(joiningplayer.crypto_idfp)), "/elo.txt"); - dprint("Retrieving playerstats from URL: ", uri, "\n"); + LOG_TRACE("Retrieving playerstats from URL: ", uri, "\n"); url_single_fopen( uri, FILE_APPEND, @@ -485,7 +482,7 @@ void PlayerStats_PlayerBasic_CheckUpdate(entity joiningplayer) // determine whether we should retrieve playerbasic information again #if 0 - printf("PlayerStats_PlayerBasic_CheckUpdate('%s'): %f\n", + LOG_INFOF("PlayerStats_PlayerBasic_CheckUpdate('%s'): %f\n", joiningplayer.netname, time ); @@ -509,7 +506,7 @@ void PlayerStats_PlayerBasic_Handler(entity fh, entity p, float status) { case URL_READY_CANWRITE: { - dprint("-- Sending data to player stats server\n"); + LOG_TRACE("-- Sending data to player stats server\n"); /*url_fputs(fh, "V 1\n"); #ifdef WATERMARK url_fputs(fh, sprintf("R %s\n", WATERMARK)); @@ -527,11 +524,11 @@ void PlayerStats_PlayerBasic_Handler(entity fh, entity p, float status) case URL_READY_CANREAD: { string s = ""; - dprint("-- Got response from player stats server:\n"); + LOG_TRACE("-- Got response from player stats server:\n"); //string gametype = string_null; while((s = url_fgets(fh))) { - dprint(" ", s, "\n"); + LOG_TRACE(" ", s, "\n"); /* string key = "", value = "", data = ""; @@ -582,21 +579,21 @@ void PlayerStats_PlayerBasic_Handler(entity fh, entity p, float status) continue; */ } - dprint("-- End of response.\n"); + LOG_TRACE("-- End of response.\n"); url_fclose(fh); break; } case URL_READY_CLOSED: { // url_fclose has finished - print("Player stats synchronized with server\n"); + LOG_INFO("Player stats synchronized with server\n"); break; } case URL_READY_ERROR: default: { - print("Receiving player stats failed: ", ftos(status), "\n"); + LOG_INFO("Receiving player stats failed: ", ftos(status), "\n"); break; } } @@ -611,7 +608,7 @@ void PlayerStats_PlayerBasic_Handler(entity fh, entity p, float status) float i = 0; for(e = PS_D_IN_EVL; (en = db_get(PS_D_IN_DB, e)) != ""; e = en) { - print(sprintf("%d:%s:%s\n", i, e, db_get(PS_D_IN_DB, sprintf("#%s", e)))); + LOG_INFO(sprintf("%d:%s:%s\n", i, e, db_get(PS_D_IN_DB, sprintf("#%s", e)))); ++i; } #endif @@ -635,10 +632,10 @@ void PlayerStats_PlayerDetail_AddItem(string event, string data) // now actually set the event data db_put(PS_D_IN_DB, sprintf("#%s", event), data); - dprint("Added item ", sprintf("#%s", event), "=", data, " to PS_D_IN_DB\n"); + LOG_TRACE("Added item ", sprintf("#%s", event), "=", data, " to PS_D_IN_DB\n"); } -void PlayerStats_PlayerDetail(void) +void PlayerStats_PlayerDetail() { // http://stats.xonotic.org/player/me if((autocvar_g_playerstats_playerdetail_uri != "") && (crypto_getmyidstatus(0) > 0)) @@ -648,7 +645,7 @@ void PlayerStats_PlayerDetail(void) PS_D_IN_DB = db_create(); //uri = strcat(uri, "/player/", uri_escape(crypto_getmyidfp(0))); - dprint("Retrieving playerstats from URL: ", autocvar_g_playerstats_playerdetail_uri, "\n"); + LOG_TRACE("Retrieving playerstats from URL: ", autocvar_g_playerstats_playerdetail_uri, "\n"); url_single_fopen( autocvar_g_playerstats_playerdetail_uri, FILE_APPEND, @@ -671,13 +668,13 @@ void PlayerStats_PlayerDetail(void) } } -void PlayerStats_PlayerDetail_CheckUpdate(void) +void PlayerStats_PlayerDetail_CheckUpdate() { // determine whether we should retrieve playerdetail information again float gamecount = cvar("cl_matchcount"); #if 0 - printf("PlayerStats_PlayerDetail_CheckUpdate(): %f >= %f, %d > %d\n", + LOG_INFOF("PlayerStats_PlayerDetail_CheckUpdate(): %f >= %f, %d > %d\n", time, PS_D_NEXTUPDATETIME, PS_D_LASTGAMECOUNT, @@ -703,7 +700,7 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status) { case URL_READY_CANWRITE: { - dprint("PlayerStats_PlayerDetail_Handler(): Sending data to player stats server...\n"); + LOG_TRACE("PlayerStats_PlayerDetail_Handler(): Sending data to player stats server...\n"); url_fputs(fh, "V 1\n"); #ifdef WATERMARK url_fputs(fh, sprintf("R %s\n", WATERMARK)); @@ -776,7 +773,7 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status) default: { - printf( + LOG_INFOF( "PlayerStats_PlayerDetail_Handler(): ERROR: " "Key went unhandled? Is our version outdated?\n" "PlayerStats_PlayerDetail_Handler(): " @@ -790,7 +787,7 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status) } #if 0 - print(sprintf( + LOG_INFO(sprintf( "PlayerStats_PlayerDetail_Handler(): " "Key '%s', Event '%s', Data '%s'\n", key, @@ -809,14 +806,14 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status) case URL_READY_CLOSED: { // url_fclose has finished - print("PlayerStats_PlayerDetail_Handler(): Player stats synchronized with server.\n"); + LOG_INFO("PlayerStats_PlayerDetail_Handler(): Player stats synchronized with server.\n"); break; } case URL_READY_ERROR: default: { - print("PlayerStats_PlayerDetail_Handler(): Receiving player stats failed: ", ftos(status), "\n"); + LOG_INFO("PlayerStats_PlayerDetail_Handler(): Receiving player stats failed: ", ftos(status), "\n"); PlayerStats_PlayerDetail_Status = PS_D_STATUS_ERROR; if(PS_D_IN_DB >= 0) { @@ -1037,8 +1034,7 @@ void PlayerInfo_Details() #endif #ifdef CSQC -/* - * FIXME - crypto_* builtin functions missing in CSQC (csprogsdefs.qh:885) +// FIXME - crypto_* builtin functions missing in CSQC (csprogsdefs.qh:885) void PlayerInfo_Details() { print("-- Getting detailed PlayerInfo for local player (CSQC)\n");