X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=445c5eb38df8e554cea13b9780cd99c2e8d8d131;hp=668e86f8984003f6096b2f58e36e8086608d3928;hb=ce607085bc5684e0066498289cc4c19b2dab1bb6;hpb=9d95434ffe42dc301ac1aef806bcad1d4eed1f66 diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 668e86f898..445c5eb38d 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -16,16 +16,13 @@ void WarpZone_crosshair_trace(entity pl) void() spawnfunc_info_player_deathmatch; // needed for the other spawnpoints void() spawnpoint_use; -float race_GetTime(float pos); -string race_GetName(float pos); -string race_PlaceName(float pos); string GetMapname(); string ColoredTeamName(float t); string admin_name(void) { - if(cvar_string("sv_adminnick") != "") - return cvar_string("sv_adminnick"); + if(autocvar_sv_adminnick != "") + return autocvar_sv_adminnick; else return "SERVER ADMIN"; } @@ -95,16 +92,16 @@ string GetAdvancedDeathReports(entity enPlayer) // Extra fragmessage information else strPlayerPingColor = "^2"; - if((cvar("sv_fragmessage_information_stats")) && (enPlayer.health >= 1)) + if((autocvar_sv_fragmessage_information_stats) && (enPlayer.health >= 1)) strMessage = strcat(strMessage, "\n^7(Health ^1", ftos(nPlayerHealth), "^7 / Armor ^2", ftos(nPlayerArmor), "^7)"); - if(cvar("sv_fragmessage_information_ping")) { + if(autocvar_sv_fragmessage_information_ping) { if(clienttype(enPlayer) == CLIENTTYPE_BOT) // Bots have no ping strMessage = strcat(strMessage, " ^7(^2Bot"); else strMessage = strcat(strMessage, " ^7(Ping ", strPlayerPingColor, ftos(nPlayerPing), "ms"); - if(cvar("sv_fragmessage_information_handicap")) - if(cvar("sv_fragmessage_information_handicap") == 2) + if(autocvar_sv_fragmessage_information_handicap) + if(autocvar_sv_fragmessage_information_handicap == 2) if(nPlayerHandicap <= 1) strMessage = strcat(strMessage, "^7 / Handicap ^2Off^7)"); else @@ -113,8 +110,8 @@ string GetAdvancedDeathReports(entity enPlayer) // Extra fragmessage information strMessage = strcat(strMessage, "^7 / Handicap ^2", ftos(nPlayerHandicap), "^7)"); else strMessage = strcat(strMessage, "^7)"); - } else if(cvar("sv_fragmessage_information_handicap")) { - if(cvar("sv_fragmessage_information_handicap") == 2) + } else if(autocvar_sv_fragmessage_information_handicap) { + if(autocvar_sv_fragmessage_information_handicap == 2) if(nPlayerHandicap <= 1) strMessage = strcat(strMessage, "\n^7(Handicap ^2Off^7)"); else @@ -138,29 +135,29 @@ void GameLogEcho(string s) string fn; float matches; - if (cvar("sv_eventlog_files")) + if (autocvar_sv_eventlog_files) { if (!logfile_open) { logfile_open = TRUE; - matches = cvar("sv_eventlog_files_counter") + 1; + matches = autocvar_sv_eventlog_files_counter + 1; cvar_set("sv_eventlog_files_counter", ftos(matches)); fn = ftos(matches); if (strlen(fn) < 8) fn = strcat(substring("00000000", 0, 8 - strlen(fn)), fn); - fn = strcat(cvar_string("sv_eventlog_files_nameprefix"), fn, cvar_string("sv_eventlog_files_namesuffix")); + fn = strcat(autocvar_sv_eventlog_files_nameprefix, fn, autocvar_sv_eventlog_files_namesuffix); logfile = fopen(fn, FILE_APPEND); fputs(logfile, ":logversion:3\n"); } if (logfile >= 0) { - if (cvar("sv_eventlog_files_timestamps")) + if (autocvar_sv_eventlog_files_timestamps) fputs(logfile, strcat(":time:", strftime(TRUE, "%Y-%m-%d %H:%M:%S", "\n", s, "\n"))); else fputs(logfile, strcat(s, "\n")); } } - if (cvar("sv_eventlog_console")) + if (autocvar_sv_eventlog_console) { print(s, "\n"); } @@ -184,6 +181,7 @@ void GameLogClose() vector PL_VIEW_OFS; vector PL_MIN; vector PL_MAX; +vector PL_HEAD; vector PL_CROUCH_VIEW_OFS; vector PL_CROUCH_MIN; vector PL_CROUCH_MAX; @@ -191,12 +189,13 @@ vector PL_CROUCH_MAX; float spawnpoint_nag; void relocate_spawnpoint() { - PL_VIEW_OFS = stov(cvar_string("sv_player_viewoffset")); - PL_MIN = stov(cvar_string("sv_player_mins")); - PL_MAX = stov(cvar_string("sv_player_maxs")); - PL_CROUCH_VIEW_OFS = stov(cvar_string("sv_player_crouch_viewoffset")); - PL_CROUCH_MIN = stov(cvar_string("sv_player_crouch_mins")); - PL_CROUCH_MAX = stov(cvar_string("sv_player_crouch_maxs")); + PL_VIEW_OFS = stov(autocvar_sv_player_viewoffset); + PL_MIN = stov(autocvar_sv_player_mins); + PL_MAX = stov(autocvar_sv_player_maxs); + PL_HEAD = stov(autocvar_sv_player_headsize); + PL_CROUCH_VIEW_OFS = stov(autocvar_sv_player_crouch_viewoffset); + PL_CROUCH_MIN = stov(autocvar_sv_player_crouch_mins); + PL_CROUCH_MAX = stov(autocvar_sv_player_crouch_maxs); // nudge off the floor setorigin(self, self.origin + '0 0 1'); @@ -214,7 +213,7 @@ void relocate_spawnpoint() print(" needs to be moved out of solid, e.g. by '", ftos(self.origin_x - o_x)); print(" ", ftos(self.origin_y - o_y)); print(" ", ftos(self.origin_z - o_z), "'\n"); - if (cvar("g_spawnpoints_auto_move_out_of_solid")) + if (autocvar_g_spawnpoints_auto_move_out_of_solid) { if (!spawnpoint_nag) print("\{1}^1NOTE: this map needs FIXING (it contains spawnpoints in solid, see server log)\n"); @@ -238,7 +237,7 @@ void relocate_spawnpoint() if (self.team) have_team_spawns = 1; - if (cvar("r_showbboxes")) + if (autocvar_r_showbboxes) { // show where spawnpoints point at too makevectors(self.angles); @@ -469,28 +468,6 @@ string formatmessage(string msg) replacement = ftos(vlen(self.velocity - self.velocity_z * '0 0 1')); else if (escape == "S") replacement = ftos(vlen(self.velocity)); - else if (escape == "v") { - float weapon_number; - local entity stats; - - if(self.classname == "spectator") - stats = self.enemy; - else - stats = self; - - weapon_number = stats.weapon; - - if (!weapon_number) - weapon_number = stats.switchweapon; - - if (!weapon_number) - weapon_number = stats.cnt; - - if(stats.cvar_cl_accuracy_data_share && stats.stats_fired[weapon_number - 1]) - replacement = ftos(bound(0, floor(100 * stats.stats_hit[weapon_number - 1] / stats.stats_fired[weapon_number - 1]), 100)); - else - replacement = "~"; // or something to indicate NULL, not available - } msg = strcat(substring(msg, 0, p), replacement, substring(msg, p+2, strlen(msg) - (p+2))); p = p + strlen(replacement); @@ -638,6 +615,7 @@ void GetCvars(float f) GetCvars_handleFloat(s, f, cvar_cl_forceplayermodelsfromxonotic, "cl_forceplayermodelsfromxonotic"); #endif GetCvars_handleFloatOnce(s, f, cvar_cl_gunalign, "cl_gunalign"); + GetCvars_handleFloat(s, f, cvar_cl_allow_uid2name, "cl_allow_uid2name"); // fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early) if (f > 0) @@ -660,8 +638,8 @@ float fexists(string f) void backtrace(string msg) { float dev, war; - dev = cvar("developer"); - war = cvar("prvm_backtraceforwarnings"); + dev = autocvar_developer; + war = autocvar_prvm_backtraceforwarnings; cvar_set("developer", "1"); cvar_set("prvm_backtraceforwarnings", "1"); print("\n"); @@ -816,6 +794,8 @@ vector randompos(vector m1, vector m2) return v; }; +//#NO AUTOCVARS START + float g_pickup_shells; float g_pickup_shells_max; float g_pickup_nails; @@ -855,6 +835,7 @@ float g_pickup_ammo_anyway; float g_pickup_weapons_anyway; float g_weaponarena; float g_weaponarena_random; +float g_weaponarena_random_with_laser; string g_weaponarena_list; float g_weaponspeedfactor; float g_weaponratefactor; @@ -995,20 +976,28 @@ void readplayerstartcvars() g_weaponarena_random = cvar("g_weaponarena_random"); else g_weaponarena_random = 0; + g_weaponarena_random_with_laser = cvar("g_weaponarena_random_with_laser"); if (g_weaponarena) { start_weapons = g_weaponarena; - if (g_weaponarena & (WEPBIT_GRENADE_LAUNCHER | WEPBIT_MINE_LAYER | WEPBIT_HAGAR | WEPBIT_ROCKET_LAUNCHER)) - start_ammo_rockets = 999; - if (g_weaponarena & WEPBIT_SHOTGUN) - start_ammo_shells = 999; - if (g_weaponarena & (WEPBIT_ELECTRO | WEPBIT_CRYLINK | WEPBIT_NEX | WEPBIT_MINSTANEX | WEPBIT_HLAC | WEPBIT_HOOK)) - start_ammo_cells = 999; - if (g_weaponarena & (WEPBIT_UZI | WEPBIT_CAMPINGRIFLE)) - start_ammo_nails = 999; - if (g_weaponarena & WEPBIT_HOOK) - start_ammo_fuel = 999; + for (j = WEP_FIRST; j <= WEP_LAST; ++j) + { + e = get_weaponinfo(j); + if(start_weapons & e.weapons) + { + if(e.items & IT_ROCKETS) + start_ammo_rockets = 999; + if(e.items & IT_SHELLS) + start_ammo_shells = 999; + if(e.items & IT_CELLS) + start_ammo_cells = 999; + if(e.items & IT_NAILS) + start_ammo_nails = 999; + if(e.items & IT_FUEL) + start_ammo_fuel = 999; + } + } start_items |= IT_UNLIMITED_AMMO; } else if (g_minstagib) @@ -1175,8 +1164,6 @@ float sv_pitch_min; float sv_pitch_max; float sv_pitch_fixyaw; -float sv_accuracy_data_share; - void readlevelcvars(void) { // first load all the mutators @@ -1184,8 +1171,13 @@ void readlevelcvars(void) MUTATOR_ADD(mutator_nix); if(cvar("g_dodging")) MUTATOR_ADD(mutator_dodging); - if(cvar("g_rocket_flying") || (cvar("g_balance_rocketlauncher_detonatedelay") == 0 && stof(cvar_defstring("g_balance_rocketlauncher_detonatedelay")) != 0)) + if(cvar("g_rocket_flying")) MUTATOR_ADD(mutator_rocketflying); + if(cvar("g_vampire")) + MUTATOR_ADD(mutator_vampire); + + if(cvar("sv_allow_fullbright")) + serverflags |= SERVERFLAG_ALLOW_FULLBRIGHT; g_bugrigs = cvar("g_bugrigs"); g_bugrigs_planar_movement = cvar("g_bugrigs_planar_movement"); @@ -1226,11 +1218,9 @@ void readlevelcvars(void) g_footsteps = cvar("g_footsteps"); g_grappling_hook = cvar("g_grappling_hook"); g_jetpack = cvar("g_jetpack"); - g_laserguided_missile = cvar("g_laserguided_missile"); g_midair = cvar("g_midair"); g_minstagib = cvar("g_minstagib"); g_norecoil = cvar("g_norecoil"); - g_vampire = cvar("g_vampire"); g_bloodloss = cvar("g_bloodloss"); sv_maxidle = cvar("sv_maxidle"); sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle"); @@ -1307,7 +1297,9 @@ void readlevelcvars(void) g_pinata = cvar("g_pinata"); - g_weapon_stay = cvar("g_weapon_stay"); + g_weapon_stay = cvar(strcat("g_", GetGametype(), "_weapon_stay")); + if(!g_weapon_stay) + g_weapon_stay = cvar("g_weapon_stay"); if (!g_weapon_stay && (cvar("deathmatch") == 2)) g_weapon_stay = 1; @@ -1324,30 +1316,10 @@ void readlevelcvars(void) sv_pitch_max = cvar("sv_pitch_max"); sv_pitch_fixyaw = cvar("sv_pitch_fixyaw"); - sv_accuracy_data_share = boolean(cvar("sv_accuracy_data_share")); - readplayerstartcvars(); } -/* -// TODO sound pack system -string soundpack; - -string precache_sound_builtin (string s) = #19; -void(entity e, float chan, string samp, float vol, float atten) sound_builtin = #8; -string precache_sound(string s) -{ - return precache_sound_builtin(strcat(soundpack, s)); -} -void play2(entity e, string filename) -{ - stuffcmd(e, strcat("play2 ", soundpack, filename, "\n")); -} -void sound(entity e, float chan, string samp, float vol, float atten) -{ - sound_builtin(e, chan, strcat(soundpack, samp), vol, atten); -} -*/ +//#NO AUTOCVARS END // Sound functions string precache_sound (string s) = #19; @@ -1376,7 +1348,7 @@ float sound_allowed(float dest, entity e) if (e == msg_entity) return TRUE; // sounds by players can be removed - if (cvar("bot_sound_monopoly")) + if (autocvar_bot_sound_monopoly) if (clienttype(e) == CLIENTTYPE_REAL) return FALSE; // anything else may pass @@ -1522,7 +1494,7 @@ void play2team(float t, string filename) { local entity head; - if (cvar("bot_sound_monopoly")) + if (autocvar_bot_sound_monopoly) return; FOR_EACH_REALPLAYER(head) @@ -1534,7 +1506,7 @@ void play2team(float t, string filename) void play2all(string samp) { - if (cvar("bot_sound_monopoly")) + if (autocvar_bot_sound_monopoly) return; sound(world, CHAN_AUTO, samp, VOL_BASE, ATTN_NONE); @@ -1599,12 +1571,12 @@ void precache() } #ifdef TTURRETS_ENABLED - if (cvar("g_turrets")) + if (autocvar_g_turrets) turrets_precash(); #endif // Precache all player models if desired - if (cvar("sv_precacheplayermodels")) + if (autocvar_sv_precacheplayermodels) { PrecachePlayerSounds("sound/player/default.sounds"); precache_all_playermodels("models/player/*.zym"); @@ -1614,22 +1586,22 @@ void precache() precache_all_playermodels("models/player/*.iqm"); } - if (cvar("sv_defaultcharacter")) + if (autocvar_sv_defaultcharacter) { string s; - s = cvar_string("sv_defaultplayermodel_red"); + s = autocvar_sv_defaultplayermodel_red; if (s != "") precache_playermodel(s); - s = cvar_string("sv_defaultplayermodel_blue"); + s = autocvar_sv_defaultplayermodel_blue; if (s != "") precache_playermodel(s); - s = cvar_string("sv_defaultplayermodel_yellow"); + s = autocvar_sv_defaultplayermodel_yellow; if (s != "") precache_playermodel(s); - s = cvar_string("sv_defaultplayermodel_pink"); + s = autocvar_sv_defaultplayermodel_pink; if (s != "") precache_playermodel(s); - s = cvar_string("sv_defaultplayermodel"); + s = autocvar_sv_defaultplayermodel; if (s != "") precache_playermodel(s); } @@ -1689,7 +1661,7 @@ void precache() precache_sound ("weapons/hook_impact.wav"); // hook } - if(cvar("sv_precacheweapons")) + if(autocvar_sv_precacheweapons) { //precache weapon models/sounds local float wep; @@ -2043,11 +2015,12 @@ float WarpZone_Projectile_Touch_ImpactFilter_Callback() } #define PROJECTILE_TOUCH if(WarpZone_Projectile_Touch()) return -float MAX_IPBAN_URIS = 16; - -float URI_GET_DISCARD = 0; -float URI_GET_IPBAN = 1; -float URI_GET_IPBAN_END = 16; +float MAX_IPBAN_URIS = 16; + +float URI_GET_DISCARD = 0; +float URI_GET_IPBAN = 1; +float URI_GET_IPBAN_END = 16; +float URI_GET_PLAYERSTATS_SENT = 17; void URI_Get_Callback(float id, float status, string data) { @@ -2064,6 +2037,10 @@ void URI_Get_Callback(float id, float status, string data) // online ban list OnlineBanList_URI_Get_Callback(id, status, data); } + else if (id == URI_GET_PLAYERSTATS_SENT) + { + PlayerStats_Sent_URI_Get_Callback(id, status, data); + } else { print("Received HTTP request data for an invalid id ", ftos(id), ".\n"); @@ -2078,6 +2055,106 @@ void print_to(entity e, string s) print(s, "\n"); } +string uid2name(string myuid) { + string s; + s = db_get(ServerProgsDB, strcat("uid2name", myuid)); + + if(s == "") + s = "^1Unregistered Player"; + return s; +} + +float race_readTime(string map, float pos) +{ + string rr; + if(g_cts) + rr = CTS_RECORD; + else + rr = RACE_RECORD; + + return stof(db_get(ServerProgsDB, strcat(map, rr, "time", ftos(pos)))); +} + +string race_readUID(string map, float pos) +{ + string rr; + if(g_cts) + rr = CTS_RECORD; + else + rr = RACE_RECORD; + + return db_get(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos))); +} + +float race_readPos(string map, float t) { + float i; + for (i = 1; i <= RANKINGS_CNT; ++i) + if (race_readTime(map, i) == 0 || race_readTime(map, i) > t) + return i; + + return 0; // pos is zero if unranked +} + +void race_writeTime(string map, float t, string myuid) +{ + string rr; + if(g_cts) + rr = CTS_RECORD; + else + rr = RACE_RECORD; + + float newpos; + newpos = race_readPos(map, t); + + float i, prevpos; + for(i = 1; i <= RANKINGS_CNT; ++i) + { + if(race_readUID(map, i) == myuid) + prevpos = i; + } + if (prevpos) { // player improved his existing record, only have to iterate on ranks between new and old recs + for (i = prevpos; i > newpos; --i) { + db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(map, i - 1))); + db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1)); + } + } else { // player has no ranked record yet + for (i = RANKINGS_CNT; i > newpos; --i) { + db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(map, i - 1))); + db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1)); + } + } + + // store new time itself + db_put(ServerProgsDB, strcat(map, rr, "time", ftos(newpos)), ftos(t)); + db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(newpos)), myuid); +} + +string race_readName(string map, float pos) +{ + string rr; + if(g_cts) + rr = CTS_RECORD; + else + rr = RACE_RECORD; + + return uid2name(db_get(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos)))); +} + +string race_placeName(float pos) { + if(floor((mod(pos, 100))/10) * 10 != 10) // examples: 12th, 111th, 213th will not execute this block + { + if(mod(pos, 10) == 1) + return strcat(ftos(pos), "st"); + else if(mod(pos, 10) == 2) + return strcat(ftos(pos), "nd"); + else if(mod(pos, 10) == 3) + return strcat(ftos(pos), "rd"); + else + return strcat(ftos(pos), "th"); + } + else + return strcat(ftos(pos), "th"); +} string getrecords(float page) // 50 records per page { float rec; @@ -2099,6 +2176,7 @@ string getrecords(float page) // 50 records per page r = stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, "/captimerecord/time"))); if (r == 0) continue; + // TODO: uid2name h = db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, "/captimerecord/netname")); s = strcat(s, strpad(32, MapInfo_Map_bspname), " ", strpad(-6, ftos_decimals(r, 2)), " ", h, "\n"); ++rec; @@ -2112,10 +2190,10 @@ string getrecords(float page) // 50 records per page { if (MapInfo_Get_ByID(i)) { - r = stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, RACE_RECORD, "time"))); + r = race_readTime(MapInfo_Map_bspname, 1); if (r == 0) continue; - h = db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, RACE_RECORD, "netname")); + h = race_readName(MapInfo_Map_bspname, 1); s = strcat(s, strpad(32, MapInfo_Map_bspname), " ", strpad(-8, TIME_ENCODED_TOSTRING(r)), " ", h, "\n"); ++rec; } @@ -2128,10 +2206,10 @@ string getrecords(float page) // 50 records per page { if (MapInfo_Get_ByID(i)) { - r = stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, CTS_RECORD, "time"))); + r = race_readTime(MapInfo_Map_bspname, 1); if (r == 0) continue; - h = db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, CTS_RECORD, "netname")); + h = race_readName(MapInfo_Map_bspname, 1); s = strcat(s, strpad(32, MapInfo_Map_bspname), " ", strpad(-8, TIME_ENCODED_TOSTRING(r)), " ", h, "\n"); ++rec; } @@ -2161,11 +2239,11 @@ string getrankings() for (i = 1; i <= RANKINGS_CNT; ++i) { - t = race_GetTime(i); + t = race_readTime(map, i); if (t == 0) continue; - n = race_GetName(i); - p = race_PlaceName(i); + n = race_readName(map, i); + p = race_placeName(i); s = strcat(s, strpad(8, p), " ", strpad(-8, TIME_ENCODED_TOSTRING(t)), " ", n, "\n"); } @@ -2177,6 +2255,193 @@ string getrankings() return strcat("Records for ", map, ":\n", s); } +#define LADDER_FIRSTPOINT 100 +#define LADDER_CNT 10 + // position X still gives LADDER_FIRSTPOINT/X points +#define LADDER_SIZE 30 + // ladder shows the top X players +string top_uids[LADDER_SIZE]; +float top_scores[LADDER_SIZE]; +string getladder() +{ + float i, j, k, uidcnt; + string s, temp_s; + + s = ""; + temp_s = ""; + + string rr; + if(g_cts) + rr = CTS_RECORD; + else + rr = RACE_RECORD; + + string myuid; + + for (k = 0; k < MapInfo_count; ++k) + { + if (MapInfo_Get_ByID(k)) + { + for (i = 0; i <= LADDER_CNT; ++i) { // i = 0 because it is the speed award + if(i == 0) // speed award + { + if(stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, rr, "speed/speed"))) == 0) + continue; + + myuid = db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, rr, "speed/crypto_idfp")); + } + else // normal record, if it exists (else break) + { + if(race_readTime(MapInfo_Map_bspname, i) == 0) + continue; + + myuid = race_readUID(MapInfo_Map_bspname, i); + } + + // string s contains: + // arg 0 = # of speed recs + // arg 1 = # of 1st place recs + // arg 2 = # of 2nd place recs + // ... etc + // LADDER_CNT+1 = total points + + temp_s = db_get(TemporaryDB, strcat("ladder", myuid)); + if (temp_s == "") + { + db_put(TemporaryDB, strcat("uid", ftos(uidcnt)), myuid); + ++uidcnt; + for (j = 0; j <= LADDER_CNT + 1; ++j) + { + if(j != LADDER_CNT + 1) + temp_s = strcat(temp_s, "0 "); + else + temp_s = strcat(temp_s, "0"); + } + } + + tokenize_console(temp_s); + s = ""; + + if(i == 0) // speed award + for (j = 0; j <= LADDER_CNT; ++j) // loop over each arg in the string + { + if(j == 0) // speed award + s = strcat(s, ftos(stof(argv(j)) +1)); // add 1 to speed rec count and write + else + s = strcat(s, " ", argv(j)); // just copy over everything else + } + else // record + for (j = 0; j <= LADDER_CNT; ++j) // loop over each arg in the string + { + if(j == 0) + s = strcat(s, argv(j)); // speed award, dont prefix with " " + else if(j == i) // wanted rec! + s = strcat(s, " ", ftos(stof(argv(j)) +1)); // update argv(j) + else + s = strcat(s, " ", argv(j)); // just copy over everything else + } + + // total points are (by default) calculated like this: + // speedrec = floor(100 / 10) = 10 points + // 1st place = floor(100 / 1) = 100 points + // 2nd place = floor(100 / 2) = 50 points + // 3rd place = floor(100 / 3) = 33 points + // 4th place = floor(100 / 4) = 25 points + // 5th place = floor(100 / 5) = 20 points + // ... etc + + if(i == 0) + s = strcat(s, " ", ftos(stof(argv(LADDER_CNT+1)) + LADDER_FIRSTPOINT / 10)); // speed award, add LADDER_FIRSTPOINT / 10 points + else + s = strcat(s, " ", ftos(stof(argv(LADDER_CNT+1)) + floor(LADDER_FIRSTPOINT / i))); // record, add LADDER_FIRSTPOINT / i points + + db_put(TemporaryDB, strcat("ladder", myuid), s); + } + } + } + + float thiscnt; + string thisuid; + for (i = 0; i <= uidcnt; ++i) // for each known uid + { + thisuid = db_get(TemporaryDB, strcat("uid", ftos(i))); + temp_s = db_get(TemporaryDB, strcat("ladder", thisuid)); + tokenize_console(temp_s); + thiscnt = stof(argv(LADDER_CNT+1)); + + if(thiscnt > top_scores[LADDER_SIZE-1]) + for (j = 0; j < LADDER_SIZE; ++j) // for each place in ladder + { + if(thiscnt > top_scores[j]) + { + for (k = LADDER_SIZE-1; k >= j; --k) + { + top_uids[k] = top_uids[k-1]; + top_scores[k] = top_scores[k-1]; + } + top_uids[j] = thisuid; + top_scores[j] = thiscnt; + break; + } + } + } + + s = "^3-----------------------\n\n"; + + s = strcat(s, "Pos ^3|"); + s = strcat(s, " ^7Total ^3|"); + for (i = 1; i <= LADDER_CNT; ++i) + { + s = strcat(s, " ^7", race_placeName(i), " ^3|"); + } + s = strcat(s, " ^7Speed awards ^3| ^7Name"); + + s = strcat(s, "\n^3----+--------"); + for (i = 1; i <= min(9, LADDER_CNT); ++i) + { + s = strcat(s, "+-----"); + } +#if LADDER_CNT > 9 + for (i = 1; i <= LADDER_CNT - 9; ++i) + { + s = strcat(s, "+------"); + } +#endif + + s = strcat(s, "+--------------+--------------------\n"); + + for (i = 0; i < LADDER_SIZE; ++i) + { + temp_s = db_get(TemporaryDB, strcat("ladder", top_uids[i])); + tokenize_console(temp_s); + if (argv(LADDER_CNT+1) == "") // total is 0, skip + continue; + s = strcat(s, strpad(4, race_placeName(i+1)), "^3| ^7"); // pos + s = strcat(s, strpad(7, argv(LADDER_CNT+1)), "^3| ^7"); // total + for (j = 1; j <= min(9, LADDER_CNT); ++j) + { + s = strcat(s, strpad(4, argv(j)), "^3| ^7"); // 1st, 2nd, 3rd etc cnt + } +#if LADDER_CNT > 9 + for (j = 10; j <= LADDER_CNT; ++j) + { + s = strcat(s, strpad(4, argv(j)), " ^3| ^7"); // 1st, 2nd, 3rd etc cnt + } +#endif + + s = strcat(s, strpad(13, argv(0)), "^3| ^7"); // speed award cnt + s = strcat(s, uid2name(top_uids[i]), "\n"); // name + } + + MapInfo_ClearTemps(); + + if (s == "") + return "No ladder on this server!\n"; + else + return strcat("Top ", ftos(LADDER_SIZE), " ladder rankings:\n", s); +} + + float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, float badsurfaceflags, float attempts, float maxaboveground, float minviewdistance) { float m, i; @@ -2391,7 +2656,7 @@ vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float string s; vector v; - if (cvar("g_shootfromeye")) + if (autocvar_g_shootfromeye) { if (visual) { @@ -2403,7 +2668,7 @@ vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float vecs_z = 0; } } - else if (cvar("g_shootfromcenter")) + else if (autocvar_g_shootfromcenter) { if (visual) { @@ -2415,7 +2680,7 @@ vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float vecs_z -= 2; } } - else if ((s = cvar_string("g_shootfromfixedorigin")) != "") + else if ((s = autocvar_g_shootfromfixedorigin) != "") { v = stov(s); if (y_is_right) @@ -2425,9 +2690,9 @@ vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float vecs_y = v_y; vecs_z = v_z; } - else if (cvar("g_shootfromclient")) + else if (autocvar_g_shootfromclient) { - vecs = shotorg_adjustfromclient(vecs, y_is_right, (cvar("g_shootfromclient") >= 2), algn); + vecs = shotorg_adjustfromclient(vecs, y_is_right, (autocvar_g_shootfromclient >= 2), algn); } return vecs; }