[nexuiz-commits] r6691 - in trunk/data: qcsrc/client qcsrc/server sound/nexball
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri May 8 14:50:01 EDT 2009
Author: mrbougo
Date: 2009-05-08 14:49:57 -0400 (Fri, 08 May 2009)
New Revision: 6691
Added:
trunk/data/sound/nexball/shoot1.wav
trunk/data/sound/nexball/shoot2.ogg
Modified:
trunk/data/qcsrc/client/View.qc
trunk/data/qcsrc/client/sbar.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/nexball.qc
trunk/data/qcsrc/server/w_grenadelauncher.qc
trunk/data/qcsrc/server/w_porto.qc
Log:
Nexball HUD fix, and using the porto as weapon now
Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc 2009-05-08 13:53:28 UTC (rev 6690)
+++ trunk/data/qcsrc/client/View.qc 2009-05-08 18:49:57 UTC (rev 6691)
@@ -11,7 +11,7 @@
vector p, dir, ang, q, nextdir;
float idx, portal_number, portal1_idx;
- if(activeweapon != WEP_PORTO || spectatee_status)
+ if(activeweapon != WEP_PORTO || spectatee_status || gametype == GAME_NEXBALL)
return;
if(intermission == 1)
return;
Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc 2009-05-08 13:53:28 UTC (rev 6690)
+++ trunk/data/qcsrc/client/sbar.qc 2009-05-08 18:49:57 UTC (rev 6691)
@@ -2213,7 +2213,7 @@
stat_items = getstati(STAT_ITEMS);
nb_pb_starttime = getstatf(STAT_NB_METERSTART);
- if(cvar("sbar_ballstatus_right"))
+ if(cvar_or("sbar_ballstatus_right", cvar("sbar_flagstatus_right")))
pos_x = vid_conwidth - 66 - sbar_x - 64; // the 66 comes from trial and error, no idea about the 64 (see CTF)
else
pos_x = 10 - sbar_x;
@@ -2221,7 +2221,7 @@
pos_z = 0;
if(sbar_hudselector == 1)
- pos_y = (vid_conheight - sbar_y) - cvar("sbar_ballstatus_pos") - 64;
+ pos_y = (vid_conheight - sbar_y) - cvar_or("sbar_ballstatus_pos", 123) - 64;
else
pos_y = -124; // 17 more than flag icons
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2009-05-08 13:53:28 UTC (rev 6690)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2009-05-08 18:49:57 UTC (rev 6691)
@@ -887,14 +887,14 @@
else if(g_race)
t = (i == WEP_LASER);
else if(g_nexball)
- t = 0; //GL is set a few lines later
+ t = 0; // weapon is set a few lines later
else
t = (i == WEP_LASER || i == WEP_SHOTGUN);
if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
t += (i == WEP_HOOK);
}
- if(g_nexball && i == WEP_GRENADE_LAUNCHER)
+ if(g_nexball && i == WEP_PORTO)
t=1;
if(t)
Modified: trunk/data/qcsrc/server/nexball.qc
===================================================================
--- trunk/data/qcsrc/server/nexball.qc 2009-05-08 13:53:28 UTC (rev 6690)
+++ trunk/data/qcsrc/server/nexball.qc 2009-05-08 18:49:57 UTC (rev 6691)
@@ -577,7 +577,7 @@
if (!(ball = self.ballcarried))
return;
- W_SetupShot (self, FALSE, 4, "weapons/grenade_fire.wav");
+ W_SetupShot (self, FALSE, 4, "nexball/shoot1.wav");
tracebox(w_shotorg, BALL_MINS, BALL_MAXS, w_shotorg, MOVE_WORLDONLY, world);
if(trace_startsolid)
{
@@ -608,8 +608,8 @@
local entity missile;
if (!(balls & BALL_BASKET))
return;
- W_SetupShot (self, FALSE, 2, "weapons/grenade_fire.wav");
- pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
+ W_SetupShot (self, FALSE, 2, "nexball/shoot2.ogg");
+// pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
missile = spawn ();
missile.owner = self;
@@ -667,14 +667,15 @@
}
else if (req == WR_PRECACHE)
{
- precache_model ("models/weapons/g_gl.md3");
- precache_model ("models/weapons/v_gl.md3");
- precache_model ("models/weapons/h_gl.dpm");
+ precache_model ("models/weapons/g_porto.md3");
+ precache_model ("models/weapons/v_porto.md3");
+ precache_model ("models/weapons/h_porto.dpm");
precache_model ("models/elaser.mdl");
- precache_sound ("weapons/grenade_fire.wav");
+ precache_sound ("nexball/shoot1.wav");
+ precache_sound ("nexball/shoot2.ogg");
}
else if (req == WR_SETUP)
- weapon_setup(WEP_GRENADE_LAUNCHER);
+ weapon_setup(WEP_PORTO);
else if (req == WR_SUICIDEMESSAGE)
{
w_deathtypestring = "is a weirdo";
Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc 2009-05-08 13:53:28 UTC (rev 6690)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc 2009-05-08 18:49:57 UTC (rev 6691)
@@ -147,10 +147,8 @@
}
.float bot_secondary_grenademooth;
-float w_nexball_weapon(float req);
float w_glauncher(float req)
{
- if (g_nexball) { return w_nexball_weapon(req); }
if (req == WR_AIM)
{
self.BUTTON_ATCK = FALSE;
Modified: trunk/data/qcsrc/server/w_porto.qc
===================================================================
--- trunk/data/qcsrc/server/w_porto.qc 2009-05-08 13:53:28 UTC (rev 6690)
+++ trunk/data/qcsrc/server/w_porto.qc 2009-05-08 18:49:57 UTC (rev 6691)
@@ -202,10 +202,12 @@
weapon_defaultspawnfunc(WEP_PORTO);
}
+float w_nexball_weapon(float req);
float w_porto(float req)
{
vector v_angle_save;
+ if (g_nexball) { return w_nexball_weapon(req); }
if (req == WR_AIM)
{
self.BUTTON_ATCK = FALSE;
Added: trunk/data/sound/nexball/shoot1.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/nexball/shoot1.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/nexball/shoot2.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/nexball/shoot2.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the nexuiz-commits
mailing list