From 8ceba3da880bd12396f0c53530a9d9bb003ada61 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 17 May 2007 10:19:36 +0000 Subject: [PATCH] cfg fixup; removed dprints; slime/lava sound only for players/dead corpses; keyhunt sound fix git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2576 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 11 ++++++----- data/high.cfg | 13 ------------- data/low.cfg | 15 +-------------- data/med.cfg | 13 ------------- data/normal.cfg | 15 +-------------- data/omg.cfg | 15 +-------------- data/qcsrc/server/bots.qc | 5 ----- data/qcsrc/server/g_violence.qc | 2 +- data/qcsrc/server/g_world.qc | 24 +++++++++++++----------- data/qcsrc/server/keyhunt.qc | 4 ++-- data/ultimate.cfg | 15 +-------------- data/ultra.cfg | 13 ------------- 12 files changed, 26 insertions(+), 119 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index a9191715c..3d5f1b333 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -440,11 +440,12 @@ cl_decals_fadetime 1 cl_decals_time 2 seta cl_nogibs 0 cl_stainmaps 0 -seta r_glsl 1 -seta r_glsl_deluxemapping 1 -seta r_glsl_offsetmapping 0 -seta r_glsl_offsetmapping_reliefmapping 0 -seta r_glsl_offsetmapping_scale 0.02 +cl_particles_explosions_smokes 1 +r_glsl 1 +r_glsl_deluxemapping 1 +r_glsl_offsetmapping 0 +r_glsl_offsetmapping_reliefmapping 0 +r_glsl_offsetmapping_scale 0.02 // execute normal.cfg to make sure that all effect settings are reset alias menu_sync "" // will be re-aliased later exec normal.cfg diff --git a/data/high.cfg b/data/high.cfg index e3eef6f7e..f8876d2c6 100644 --- a/data/high.cfg +++ b/data/high.cfg @@ -1,25 +1,13 @@ cl_decals 1 cl_nogibs 0 -cl_particles 1 -cl_particles_blood 1 -cl_particles_bubbles 1 -cl_particles_bulletimpacts 1 -cl_particles_explosions_shell 0 -cl_particles_explosions_smokes 1 -cl_particles_explosions_sparks 1 cl_particles_quality 1 -cl_particles_rain 1 -cl_particles_size 1 -cl_particles_smoke 1 cl_particles_snow 1 -cl_particles_sparks 1 gl_picmip 0 r_picmipworld 0 gl_texture_anisotropy 16 r_bloom 1 r_coronas 1 gl_flashblend 0 -r_dynamic 1 r_glsl_deluxemapping 1 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 @@ -31,7 +19,6 @@ r_shadow_realtime_dlight_shadows 1 r_shadow_realtime_world 1 r_shadow_realtime_world_dlightshadows 1 r_shadow_realtime_world_shadows 1 -r_sky 1 r_depthfirst 1 r_showsurfaces 0 diff --git a/data/low.cfg b/data/low.cfg index 15e0ac93d..58d23822e 100644 --- a/data/low.cfg +++ b/data/low.cfg @@ -1,25 +1,13 @@ cl_decals 1 cl_nogibs 0 -cl_particles 1 -cl_particles_blood 1 -cl_particles_bubbles 1 -cl_particles_bulletimpacts 1 -cl_particles_explosions_shell 0 -cl_particles_explosions_smokes 1 -cl_particles_explosions_sparks 1 cl_particles_quality 0.20 -cl_particles_rain 1 -cl_particles_size 1 -cl_particles_smoke 1 -cl_particles_snow 1 -cl_particles_sparks 1 +cl_particles_snow 0 gl_picmip 2 r_picmipworld 1 gl_texture_anisotropy 1 r_bloom 0 r_coronas 1 gl_flashblend 0 -r_dynamic 1 r_glsl_deluxemapping 0 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 @@ -31,7 +19,6 @@ r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_dlightshadows 0 r_shadow_realtime_world_shadows 0 -r_sky 1 r_depthfirst 0 r_showsurfaces 0 diff --git a/data/med.cfg b/data/med.cfg index f4ae50ebf..8cee6eb91 100644 --- a/data/med.cfg +++ b/data/med.cfg @@ -1,25 +1,13 @@ cl_decals 1 cl_nogibs 0 -cl_particles 1 -cl_particles_blood 1 -cl_particles_bubbles 1 -cl_particles_bulletimpacts 1 -cl_particles_explosions_shell 0 -cl_particles_explosions_smokes 1 -cl_particles_explosions_sparks 1 cl_particles_quality 0.5 -cl_particles_rain 1 -cl_particles_size 1 -cl_particles_smoke 1 cl_particles_snow 1 -cl_particles_sparks 1 gl_picmip 2 r_picmipworld 0 gl_texture_anisotropy 1 r_bloom 0 r_coronas 1 gl_flashblend 0 -r_dynamic 1 r_glsl_deluxemapping 0 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 @@ -31,7 +19,6 @@ r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_dlightshadows 0 r_shadow_realtime_world_shadows 0 -r_sky 1 r_depthfirst 0 r_showsurfaces 0 diff --git a/data/normal.cfg b/data/normal.cfg index 601b7a493..06d452bdd 100644 --- a/data/normal.cfg +++ b/data/normal.cfg @@ -1,25 +1,13 @@ cl_decals 1 cl_nogibs 0 -cl_particles 1 -cl_particles_blood 1 -cl_particles_bubbles 1 -cl_particles_bulletimpacts 1 -cl_particles_explosions_shell 0 -cl_particles_explosions_smokes 1 -cl_particles_explosions_sparks 1 cl_particles_quality 0.5 -cl_particles_rain 1 -cl_particles_size 1 -cl_particles_smoke 1 cl_particles_snow 1 -cl_particles_sparks 1 gl_picmip 1 r_picmipworld 0 gl_texture_anisotropy 1 -r_bloom 1 +r_bloom 0 r_coronas 1 gl_flashblend 0 -r_dynamic 1 r_glsl_deluxemapping 1 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 @@ -31,7 +19,6 @@ r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_dlightshadows 0 r_shadow_realtime_world_shadows 0 -r_sky 1 r_depthfirst 1 r_showsurfaces 0 diff --git a/data/omg.cfg b/data/omg.cfg index a4c1623d4..148f2851a 100644 --- a/data/omg.cfg +++ b/data/omg.cfg @@ -1,25 +1,13 @@ cl_decals 1 cl_nogibs 0 -cl_particles 1 -cl_particles_blood 1 -cl_particles_bubbles 1 -cl_particles_bulletimpacts 1 -cl_particles_explosions_shell 0 -cl_particles_explosions_smokes 1 -cl_particles_explosions_sparks 1 cl_particles_quality 0.20 -cl_particles_rain 1 -cl_particles_size 1 -cl_particles_smoke 1 -cl_particles_snow 1 -cl_particles_sparks 1 +cl_particles_snow 0 gl_picmip 10 r_picmipworld 1 gl_texture_anisotropy 1 r_bloom 0 r_coronas 1 gl_flashblend 0 -r_dynamic 1 r_glsl_deluxemapping 0 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 @@ -31,7 +19,6 @@ r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_dlightshadows 0 r_shadow_realtime_world_shadows 0 -r_sky 1 r_depthfirst 0 r_showsurfaces 1 diff --git a/data/qcsrc/server/bots.qc b/data/qcsrc/server/bots.qc index f18337bb1..0bb9d07b2 100644 --- a/data/qcsrc/server/bots.qc +++ b/data/qcsrc/server/bots.qc @@ -1906,10 +1906,6 @@ void() bot_removefromlargestteam = local entity best, head; CheckAllowedTeams(); GetTeamCounts(world); - dprint("c1 = ", ftos(c1), "\n"); - dprint("c2 = ", ftos(c2), "\n"); - dprint("c3 = ", ftos(c3), "\n"); - dprint("c4 = ", ftos(c4), "\n"); head = findchainfloat(isbot, TRUE); if (!head) return; @@ -1942,7 +1938,6 @@ void() bot_removefromlargestteam = head = head.chain; } currentbots = currentbots - 1; - dprint("Removing from a ", ftos(bestcount), " players team!\n"); dropclient(best); }; diff --git a/data/qcsrc/server/g_violence.qc b/data/qcsrc/server/g_violence.qc index b6bd8186b..80efed986 100644 --- a/data/qcsrc/server/g_violence.qc +++ b/data/qcsrc/server/g_violence.qc @@ -62,7 +62,7 @@ void TossGib (entity gib, string mdlname, vector org, vector v, float destroyont // don't set his classname to something else or it'll screw up a lot of stuff if(gib.classname != "player") gib.classname = "gib"; - gib.iscreature = TRUE; + gib.iscreature = FALSE; // not a creature, because lava sounds on gibs are annoying gib.movetype = MOVETYPE_BOUNCE; gib.solid = SOLID_CORPSE; gib.skin = 0; diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index e6b38d787..5a0769e71 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -945,8 +945,17 @@ void() NextLevel = GameLogClose(); - maxTotalFrags = 0; FOR_EACH_CLIENT(other) + { + FixIntermissionClient(other); + + if(other.winning) + bprint(other.netname, " ^7wins.\n"); + } + + minTotalFrags = 0; + maxTotalFrags = 0; + FOR_EACH_PLAYER(other) { if(maxTotalFrags < other.totalfrags) maxTotalFrags = other.totalfrags; @@ -954,18 +963,11 @@ void() NextLevel = minTotalFrags = other.totalfrags; } - FOR_EACH_CLIENT(other) + if(!currentbots) { - FixIntermissionClient(other); - - self = other; - - if(other.winning) - bprint(other.netname, " ^7wins.\n"); - - if(!currentbots) + FOR_EACH_PLAYER(other) { - score = (other.frags - minTotalFrags) / max(maxTotalFrags - minTotalFrags, 1); + score = (other.totalfrags - minTotalFrags) / max(maxTotalFrags - minTotalFrags, 1); f = bound(0, other.play_time / max(time, 1), 1); // store some statistics? } diff --git a/data/qcsrc/server/keyhunt.qc b/data/qcsrc/server/keyhunt.qc index 4e0f259e7..09f475cfc 100644 --- a/data/qcsrc/server/keyhunt.qc +++ b/data/qcsrc/server/keyhunt.qc @@ -363,7 +363,7 @@ float kh_Key_AllOwnedByWhichTeam() void kh_Key_Collect(entity key, entity player) { - sound(key, CHAN_AUTO, kh_sound_collect, 1, ATTN_NORM); + sound(player, CHAN_AUTO, kh_sound_collect, 1, ATTN_NORM); kh_Scores_Event(player, key, "collect", cvar("g_balance_keyhunt_score_collect"), 0); bprint(player.netname, "^7 collected the ", key.netname, "\n"); @@ -488,7 +488,7 @@ void kh_Key_Think() else centerprint(head, "All keys are in your team's hands!\n\nHelp the key carriers to meet!\n"); else - centerprint(head, "All keys are in the enemy's hands!\n\nInterfere ^1NOW^7!\n"); + centerprint(head, strcat("All keys are in the ", ColoredTeamName(kh_interferemsg_team), "^7's hands!\n\nInterfere ^1NOW^7!\n")); } } diff --git a/data/ultimate.cfg b/data/ultimate.cfg index 84eeb5399..caffe6239 100644 --- a/data/ultimate.cfg +++ b/data/ultimate.cfg @@ -1,29 +1,17 @@ cl_decals 1 cl_nogibs 0 -cl_particles 1 -cl_particles_blood 1 -cl_particles_bubbles 1 -cl_particles_bulletimpacts 1 -cl_particles_explosions_shell 0 -cl_particles_explosions_smokes 1 -cl_particles_explosions_sparks 1 cl_particles_quality 1 -cl_particles_rain 1 -cl_particles_size 1 -cl_particles_smoke 1 cl_particles_snow 1 -cl_particles_sparks 1 gl_picmip 0 r_picmipworld 0 gl_texture_anisotropy 16 r_bloom 1 r_coronas 1 gl_flashblend 0 -r_dynamic 1 r_glsl_deluxemapping 1 r_glsl_offsetmapping 1 r_glsl_offsetmapping_reliefmapping 1 -r_hdr 0 +r_hdr 1 r_shadow_usenormalmap 1 r_shadow_gloss 1 r_shadow_realtime_dlight 1 @@ -31,7 +19,6 @@ r_shadow_realtime_dlight_shadows 1 r_shadow_realtime_world 1 r_shadow_realtime_world_dlightshadows 1 r_shadow_realtime_world_shadows 1 -r_sky 1 r_depthfirst 2 r_showsurfaces 0 diff --git a/data/ultra.cfg b/data/ultra.cfg index 01da27cb4..07b56e789 100644 --- a/data/ultra.cfg +++ b/data/ultra.cfg @@ -1,25 +1,13 @@ cl_decals 1 cl_nogibs 0 -cl_particles 1 -cl_particles_blood 1 -cl_particles_bubbles 1 -cl_particles_bulletimpacts 1 -cl_particles_explosions_shell 0 -cl_particles_explosions_smokes 1 -cl_particles_explosions_sparks 1 cl_particles_quality 1 -cl_particles_rain 1 -cl_particles_size 1 -cl_particles_smoke 1 cl_particles_snow 1 -cl_particles_sparks 1 gl_picmip 0 r_picmipworld 0 gl_texture_anisotropy 16 r_bloom 1 r_coronas 1 gl_flashblend 0 -r_dynamic 1 r_glsl_deluxemapping 1 r_glsl_offsetmapping 1 r_glsl_offsetmapping_reliefmapping 0 @@ -31,7 +19,6 @@ r_shadow_realtime_dlight_shadows 1 r_shadow_realtime_world 1 r_shadow_realtime_world_dlightshadows 1 r_shadow_realtime_world_shadows 1 -r_sky 1 r_depthfirst 2 r_showsurfaces 0 -- 2.39.2