X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=42c64e6a33ece7333b8d557d27aa4a64d47f90bc;hb=bad136c27b2f10dd2d4761f07b17d3a7f586a051;hp=f8a1ec1529135044333dfc2c11a996dfb1e970c9;hpb=30e724fe1e818fa1a1e57250f260f7141f1f379b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index f8a1ec152..42c64e6a3 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -176,7 +176,6 @@ void cvar_changes_init() BADPREFIX("cvar_check_"); BADCVAR("gamecfg"); BADCVAR("g_configversion"); - BADCVAR("g_maplist_index"); BADCVAR("halflifebsp"); BADCVAR("sv_mapformat_is_quake2"); BADCVAR("sv_mapformat_is_quake3"); @@ -211,6 +210,8 @@ void cvar_changes_init() BADCVAR("mastervolume"); BADCVAR("volume"); BADCVAR("bgmvolume"); + BADCVAR("in_pitch_min"); + BADCVAR("in_pitch_max"); // private BADCVAR("developer"); @@ -227,14 +228,17 @@ void cvar_changes_init() BADCVAR("sys_specialcharactertranslation"); BADCVAR("timeformat"); BADCVAR("timestamps"); + BADCVAR("g_require_stats"); BADPREFIX("developer_"); BADPREFIX("g_ban_"); BADPREFIX("g_banned_list"); + BADPREFIX("g_require_stats_"); BADPREFIX("g_chat_flood_"); BADPREFIX("g_ghost_items"); BADPREFIX("g_playerstats_"); BADPREFIX("g_voice_flood_"); BADPREFIX("log_file"); + BADPREFIX("quit_"); BADPREFIX("rcon_"); BADPREFIX("sv_allowdownloads"); BADPREFIX("sv_autodemo"); @@ -248,20 +252,26 @@ void cvar_changes_init() // these can contain player IDs, so better hide BADPREFIX("g_forced_team_"); + BADCVAR("sv_muteban_list"); // mapinfo BADCVAR("fraglimit"); + BADCVAR("g_arena"); BADCVAR("g_assault"); BADCVAR("g_ca"); BADCVAR("g_ca_teams"); + BADCVAR("g_conquest"); BADCVAR("g_ctf"); BADCVAR("g_cts"); + BADCVAR("g_dotc"); BADCVAR("g_dm"); BADCVAR("g_domination"); BADCVAR("g_domination_default_teams"); BADCVAR("g_freezetag"); BADCVAR("g_freezetag_teams"); BADCVAR("g_invasion_teams"); + BADCVAR("g_jailbreak"); + BADCVAR("g_jailbreak_teams"); BADCVAR("g_keepaway"); BADCVAR("g_keyhunt"); BADCVAR("g_keyhunt_teams"); @@ -272,12 +282,16 @@ void cvar_changes_init() BADCVAR("g_race_laps_limit"); BADCVAR("g_race_qualifying_timelimit"); BADCVAR("g_race_qualifying_timelimit_override"); + BADCVAR("g_runematch"); + BADCVAR("g_snafu"); BADCVAR("g_tdm"); BADCVAR("g_tdm_teams"); + BADCVAR("g_vip"); BADCVAR("leadlimit"); BADCVAR("nextmap"); BADCVAR("teamplay"); BADCVAR("timelimit"); + BADCVAR("g_mapinfo_ignore_warnings"); // long BADCVAR("hostname"); @@ -304,9 +318,12 @@ void cvar_changes_init() // does nothing gameplay relevant BADCVAR("captureleadlimit_override"); + BADCVAR("condump_stripcolors"); BADCVAR("gameversion"); BADCVAR("g_allow_oldvortexbeam"); BADCVAR("g_balance_kill_delay"); + BADCVAR("g_buffs_pickup_anyway"); + BADCVAR("g_buffs_randomize"); BADCVAR("g_campcheck_distance"); BADCVAR("g_ca_point_leadlimit"); BADCVAR("g_ca_point_limit"); @@ -319,31 +336,37 @@ void cvar_changes_init() BADCVAR("g_freezetag_point_limit"); BADCVAR("g_hats"); BADCVAR("g_invasion_point_limit"); + BADCVAR("g_jump_grunt"); BADCVAR("g_keyhunt_point_leadlimit"); BADCVAR("g_nexball_goalleadlimit"); BADCVAR("g_new_toys_use_pickupsound"); BADCVAR("g_physics_predictall"); BADCVAR("g_piggyback"); + BADCVAR("g_playerclip_collisions"); BADCVAR("g_tdm_point_leadlimit"); BADCVAR("g_tdm_point_limit"); BADCVAR("leadlimit_and_fraglimit"); BADCVAR("leadlimit_override"); BADCVAR("pausable"); BADCVAR("sv_checkforpacketsduringsleep"); + BADCVAR("sv_damagetext"); + BADCVAR("sv_db_saveasdump"); BADCVAR("sv_intermission_cdtrack"); BADCVAR("sv_minigames"); BADCVAR("sv_namechangetimer"); BADCVAR("sv_precacheplayermodels"); BADCVAR("sv_stepheight"); BADCVAR("sv_timeout"); + BADCVAR("sv_weapons_modeloverride"); BADPREFIX("crypto_"); BADPREFIX("gameversion_"); BADPREFIX("g_chat_"); BADPREFIX("g_ctf_captimerecord_"); - BADPREFIX("g_maplist_votable_"); + BADPREFIX("g_maplist_"); BADPREFIX("g_mod_"); BADPREFIX("g_respawn_"); BADPREFIX("net_"); + BADPREFIX("notification_"); BADPREFIX("prvm_"); BADPREFIX("skill_"); BADPREFIX("sv_allow_"); @@ -378,6 +401,7 @@ void cvar_changes_init() BADCVAR("g_buffs"); BADCVAR("g_ca_teams_override"); BADCVAR("g_ctf_ignore_frags"); + BADCVAR("g_ctf_leaderboard"); BADCVAR("g_domination_point_limit"); BADCVAR("g_domination_teams_override"); BADCVAR("g_freezetag_teams_override"); @@ -388,13 +412,6 @@ void cvar_changes_init() BADCVAR("g_keyhunt_teams_override"); BADCVAR("g_lms_lives_override"); BADCVAR("g_maplist"); - BADCVAR("g_maplist_check_waypoints"); - BADCVAR("g_maplist_mostrecent_count"); - BADCVAR("g_maplist_shuffle"); - BADCVAR("g_maplist_votable"); - BADCVAR("g_maplist_votable_abstain"); - BADCVAR("g_maplist_votable_nodetail"); - BADCVAR("g_maplist_votable_suggestions"); BADCVAR("g_maxplayers"); BADCVAR("g_mirrordamage"); BADCVAR("g_nexball_goallimit"); @@ -1138,7 +1155,7 @@ float(float exponent) MaplistMethod_Shuffle = // more clever shuffling string newlist; // now reinsert this at another position - insertpos = pow(random(), 1 / exponent); // ]0, 1] + insertpos = (random() ** (1 / exponent)); // ]0, 1] insertpos = insertpos * (Map_Count - 1); // ]0, Map_Count - 1] insertpos = ceil(insertpos) + 1; // {2, 3, 4, ..., Map_Count} LOG_TRACE("SHUFFLE: insert pos = ", ftos(insertpos)); @@ -2030,7 +2047,9 @@ void Physics_Frame() if(IS_CLIENT(it) || it.classname == "" || it.move_movetype == MOVETYPE_PUSH || it.move_movetype == MOVETYPE_FAKEPUSH || it.move_movetype == MOVETYPE_PHYSICS) continue; - set_movetype(it, it.move_movetype); + //set_movetype(it, it.move_movetype); + // inline the set_movetype function, since this is called a lot + it.movetype = (it.move_qcphysics) ? MOVETYPE_NONE : it.move_movetype; if(it.move_movetype == MOVETYPE_NONE) continue; @@ -2068,6 +2087,8 @@ void EndFrame() entity e = IS_SPEC(it) ? it.enemy : it; if (e.typehitsound) { it.typehit_time = time; + } else if (e.killsound) { + it.kill_time = time; } else if (e.damage_dealt) { it.hit_time = time; it.damage_dealt_total += ceil(e.damage_dealt); @@ -2082,6 +2103,7 @@ void EndFrame() FOREACH_CLIENT(true, { it.typehitsound = false; it.damage_dealt = 0; + it.killsound = false; antilag_record(it, CS(it), altime); }); IL_EACH(g_monsters, true,