From 099bf9627a3b839ceb1b2dee9a047439d5bfe3bf Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 6 May 2006 20:09:31 +0000 Subject: [PATCH] cl_nogibs (must be set at connect) typos in default.cfg default fullbright names git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1374 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 15 ++++++++------- data/qcsrc/server/gamec/cl_client.c | 4 ++-- data/qcsrc/server/gamec/defs.h | 1 + data/qcsrc/server/gamec/g_violence.c | 15 +++++++++++++++ data/qcsrc/server/gamec/miscfunctions.c | 1 + 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index 9e74cdb17..d6fb9f0ea 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -505,6 +505,7 @@ cl_decals_fadetime 1 cl_particles 1 cl_particles_quality 0.5 cl_stainmaps 0 +seta cl_nogibs 0 gl_picmip 1 gl_flashblend 0 r_bloom 1 @@ -682,10 +683,10 @@ alias singleplayer_continue "set scmenu_campaign_goto -1" alias singleplayer_levellist "set scmenu_campaign_dump 1; togglemenu; wait; togglemenu" // Green's fullbright skins -alias "playerfullbrightkin_green" "playermodel models/player/nexus.zym;playerskin 3" -alias "playerfullbrightkin_red" "playermodel models/player/nexus.zym;playerskin 4" -alias "playerfullbrightkin_orange" "playermodel models/player/nexus.zym;playerskin 5" -alias "g_defaultplayer_fullbrightskins_green" "set sv_defaultcharacter 1;set sv_defaultplayermodel models/player/nexus.zym;set sv_defaultplayerskin 3" -alias "g_defaultplayer_forcefullbrightskins_red" "sv_defaultcharacter 1;set sv_defaultplayermodel models/player/nexus.zym;set sv_defaultplayerskin 4" -alias "g_defaultplayer_forcefullbrightskins_orange" "sv_defaultcharacter 1;set sv_defaultplayermodel models/player/nexus.zym;set sv_defaultplayerskin 5" -alias "g_defaultplayer_forcefullbrightskins_off" "sv_defaultcharacter 0;set sv_defaultplayerskin 0" +alias "playerfullbrightskin_green" "playermodel models/player/nexus.zym;playerskin 3" +alias "playerfullbrightskin_red" "playermodel models/player/nexus.zym;playerskin 4" +alias "playerfullbrightskin_orange" "playermodel models/player/nexus.zym;playerskin 5" +alias "sv_defaultplayer_fullbrightskins_green" "set sv_defaultcharacter 1;set sv_defaultplayermodel models/player/nexus.zym;set sv_defaultplayerskin 3" +alias "sv_defaultplayer_fullbrightskins_red" "sv_defaultcharacter 1;set sv_defaultplayermodel models/player/nexus.zym;set sv_defaultplayerskin 4" +alias "sv_defaultplayer_fullbrightskins_orange" "sv_defaultcharacter 1;set sv_defaultplayermodel models/player/nexus.zym;set sv_defaultplayerskin 5" +alias "sv_defaultplayer_fullbrightskins_off" "sv_defaultcharacter 0;set sv_defaultplayerskin 0" diff --git a/data/qcsrc/server/gamec/cl_client.c b/data/qcsrc/server/gamec/cl_client.c index 3c81884ca..b0bcd9750 100644 --- a/data/qcsrc/server/gamec/cl_client.c +++ b/data/qcsrc/server/gamec/cl_client.c @@ -442,6 +442,8 @@ void PutClientInServer (void) self.viewzoom = 0.6; + self.customizeentityforclient = Client_customizeentityforclient; + if(cvar("sv_defaultcharacter") == 1) { local string defaultmodel; defaultmodel = CheckPlayerModel(cvar_string("sv_defaultplayermodel")); @@ -650,8 +652,6 @@ void ClientConnect (void) self.classname = "player_joining"; self.flags = self.flags | FL_CLIENT; - self.customizeentityforclient = Client_customizeentityforclient; - if(player_count<0) player_count = 0; bot_clientconnect(); diff --git a/data/qcsrc/server/gamec/defs.h b/data/qcsrc/server/gamec/defs.h index 61eab75e1..c4d037639 100644 --- a/data/qcsrc/server/gamec/defs.h +++ b/data/qcsrc/server/gamec/defs.h @@ -262,6 +262,7 @@ float default_player_alpha; .float() customizeentityforclient; .float cvar_cl_playerdetailreduction; +.float cvar_cl_nogibs; #ifdef ALLOW_VARIABLE_LOD .float modelindex_lod0; diff --git a/data/qcsrc/server/gamec/g_violence.c b/data/qcsrc/server/gamec/g_violence.c index 6f6a91f6c..e30600272 100644 --- a/data/qcsrc/server/gamec/g_violence.c +++ b/data/qcsrc/server/gamec/g_violence.c @@ -30,6 +30,18 @@ void GibTouch () GibDamage (other, other, 1000, 0, self.origin, '0 0 0'); } + +.float gibrandom; +.float gibmodelindex; +float() Gib_customizeentityforclient = +{ + if(self.gibrandom > other.cvar_cl_nogibs) + self.modelindex = self.gibmodelindex; + else + self.modelindex = 0; + return TRUE; +}; + // changes by LordHavoc on 03/30/04 // TossGib now takes a gib entity so it can be used for tossing heads // gib.velocity now uses randomvec() instead of a bunch of manual random calls @@ -50,8 +62,11 @@ void TossGib (entity gib, string mdlname, vector org, vector v, float destroyont gib.solid = SOLID_CORPSE; gib.skin = 0; gib.effects = 0; + gib.gibrandom = random(); // used for customize function to reduce gibs + gib.customizeentityforclient = Gib_customizeentityforclient; setmodel (gib, mdlname); + gib.gibmodelindex = gib.modelindex; setsize (gib, '-8 -8 -8', '8 8 8'); setorigin (gib, org); diff --git a/data/qcsrc/server/gamec/miscfunctions.c b/data/qcsrc/server/gamec/miscfunctions.c index 7666c2307..da6e7f78a 100644 --- a/data/qcsrc/server/gamec/miscfunctions.c +++ b/data/qcsrc/server/gamec/miscfunctions.c @@ -408,5 +408,6 @@ void GetCvars_handleFloat(float f, .float field, string name) void GetCvars(float f) { GetCvars_handleFloat(f, cvar_cl_playerdetailreduction, "cl_playerdetailreduction"); + GetCvars_handleFloat(f, cvar_cl_nogibs, "cl_nogibs"); } -- 2.39.2