r5432 - in trunk/data: . qcsrc/menu/nexuiz qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Jan 7 03:56:04 EST 2009
Author: div0
Date: 2009-01-07 03:55:49 -0500 (Wed, 07 Jan 2009)
New Revision: 5432
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
trunk/data/qcsrc/server/cl_player.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/g_world.qc
trunk/data/qcsrc/server/miscfunctions.qc
Log:
cl_hitsound + some menu changes
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-01-07 08:07:10 UTC (rev 5431)
+++ trunk/data/defaultNexuiz.cfg 2009-01-07 08:55:49 UTC (rev 5432)
@@ -605,6 +605,8 @@
sv_sound_land ""
sv_sound_watersplash ""
+seta cl_hitsound 1
+
// startmap_dm is used when running with the -listen or -dedicated commandline options
alias startmap_dm "set _sv_init 1; map aggressor"
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c 2009-01-07 08:07:10 UTC (rev 5431)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c 2009-01-07 08:55:49 UTC (rev 5432)
@@ -145,6 +145,8 @@
e.addValue(e, "5 choices", "5");
e.addValue(e, "6 choices", "6");
e.addValue(e, "7 choices", "7");
+ e.addValue(e, "8 choices", "8");
+ e.addValue(e, "9 choices", "9");
e.configureNexuizTextSliderValues(e);
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "sv_vote_simple_majority", "Simple majority wins vcall"));
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2009-01-07 08:07:10 UTC (rev 5431)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2009-01-07 08:55:49 UTC (rev 5432)
@@ -73,6 +73,7 @@
me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "View bobbing:"));
me.TD(me, 1, 2, sl);
me.TR(me);
+ me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Zoom Factor:"));
me.TD(me, 1, 2, e = makeNexuizSlider(2, 16, 0.5, "cl_zoomfactor"));
me.TR(me);
@@ -82,8 +83,8 @@
sl = makeNexuizSlider(1, 8, 0.5, "cl_zoomspeed");
me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1, 1, sl, "Zoom speed:"));
me.TD(me, 1, 2, sl);
-
me.TR(me);
+ me.TR(me);
me.TD(me, 1, 1.5, e = makeNexuizButton("Weapon settings...", '0 0 0'));
e.onClick = DialogOpenButton_Click;
e.onClickEntity = main.weaponsDialog;
@@ -136,20 +137,8 @@
e.onClickEntity = main.radarDialog;
me.TDempty(me, 0.5);
me.TR(me);
- me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Network speed:"));
- me.TD(me, 1, 2, e = makeNexuizTextSlider("_cl_rate"));
- e.addValue(e, "56k", "4000");
- e.addValue(e, "ISDN", "7000");
- e.addValue(e, "Slow ADSL", "15000");
- e.addValue(e, "Fast ADSL", "20000");
- e.addValue(e, "Broadband", "25000");
- e.configureNexuizTextSliderValues(e);
- me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Client UDP port:"));
- me.TD(me, 1, 0.64, e = makeNexuizInputBox(0, "cl_port"));
me.gotoRC(me, me.rows - 1, 0);
- me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1;name \"$_cl_name\";sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_hidewaypoints;sendcvar cl_shownames;rate $_cl_rate", COMMANDBUTTON_APPLY));
+ me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1;name \"$_cl_name\";sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_hidewaypoints;sendcvar cl_shownames", COMMANDBUTTON_APPLY));
}
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c 2009-01-07 08:07:10 UTC (rev 5431)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c 2009-01-07 08:55:49 UTC (rev 5432)
@@ -123,11 +123,17 @@
me.TR(me);
me.TR(me);
sl = makeNexuizSlider(0.15, 1, 0.05, "cl_autotaunt");
- me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "Auto taunting:"));
+ me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "Automatic taunts"));
+ if(sl.value != e.savedValue)
+ e.savedValue = 0.65; // default
+ me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizTextLabel(0.1, "Frequency:"));
me.TD(me, 1, 2, sl);
me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "cl_hitsound", "Hit indicator"));
me.gotoRC(me, me.rows - 1, 0);
- me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart", COMMANDBUTTON_APPLY));
+ me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart; sendcvar cl_hitsound; sendcvar cl_autotaunt", COMMANDBUTTON_APPLY));
}
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2009-01-07 08:07:10 UTC (rev 5431)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2009-01-07 08:55:49 UTC (rev 5432)
@@ -49,5 +49,18 @@
me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "3", "km/h"));
me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "4", "mph"));
me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "5", "knots"));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Network speed:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("_cl_rate"));
+ e.addValue(e, "56k", "4000");
+ e.addValue(e, "ISDN", "7000");
+ e.addValue(e, "Slow ADSL", "15000");
+ e.addValue(e, "Fast ADSL", "20000");
+ e.addValue(e, "Broadband", "25000");
+ e.configureNexuizTextSliderValues(e);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Client UDP port:"));
+ me.TD(me, 1, 0.64, e = makeNexuizInputBox(0, "cl_port"));
}
#endif
Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc 2009-01-07 08:07:10 UTC (rev 5431)
+++ trunk/data/qcsrc/server/cl_player.qc 2009-01-07 08:55:49 UTC (rev 5432)
@@ -905,7 +905,7 @@
sample = strcat(argv(0), ftos(floor(random() * n + 1)), ".wav"); // randomization
else
sample = strcat(argv(0), ".wav"); // randomization
-
+
if(teamsay == 3) // only to last attacker
{
if(self.pusher)
@@ -953,7 +953,8 @@
}
else if(teamsay == 4) // auto taunt
{
- float tauntrand = random();
+ float tauntrand;
+ tauntrand = random();
FOR_EACH_REALCLIENT(e)
if (tauntrand < e.cvar_cl_autotaunt)
{
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2009-01-07 08:07:10 UTC (rev 5431)
+++ trunk/data/qcsrc/server/defs.qh 2009-01-07 08:55:49 UTC (rev 5432)
@@ -85,6 +85,8 @@
.vector pos1, pos2;
.vector mangle;
+.float cvar_cl_hitsound;
+
.float pain_finished; //Added by Supajoe
.float pain_frame; //"
.float statdraintime; // record the one-second intervals between draining health and armour when they're over 100
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2009-01-07 08:07:10 UTC (rev 5431)
+++ trunk/data/qcsrc/server/g_world.qc 2009-01-07 08:55:49 UTC (rev 5432)
@@ -2336,14 +2336,14 @@
{
if(self.enemy.typehitsound)
play2(self, "misc/typehit.wav");
- else if(self.enemy.hitsound)
+ else if(self.enemy.hitsound && self.cvar_cl_hitsound)
play2(self, "misc/hit.wav");
}
else
{
if(self.typehitsound)
play2(self, "misc/typehit.wav");
- else if(self.hitsound)
+ else if(self.hitsound && self.cvar_cl_hitsound)
play2(self, "misc/hit.wav");
}
}
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2009-01-07 08:07:10 UTC (rev 5431)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2009-01-07 08:55:49 UTC (rev 5432)
@@ -550,6 +550,7 @@
GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[8], "cl_weaponpriority8", W_FixWeaponOrder_AllowIncomplete);
GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[9], "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete);
GetCvars_handleFloat(s, f, cvar_cl_autotaunt, "cl_autotaunt");
+ GetCvars_handleFloat(s, f, cvar_cl_hitsound, "cl_hitsound");
// fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early)
if(f > 0)
More information about the nexuiz-commits
mailing list