[nexuiz-commits] r6676 - in branches/nexuiz-2.0: . data/maps data/qcsrc/client data/qcsrc/common data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue May 5 15:44:25 EDT 2009
Author: div0
Date: 2009-05-05 15:44:23 -0400 (Tue, 05 May 2009)
New Revision: 6676
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/maps/reslimed.bsp
branches/nexuiz-2.0/data/maps/reslimed.map
branches/nexuiz-2.0/data/qcsrc/client/View.qc
branches/nexuiz-2.0/data/qcsrc/client/waypointsprites.qc
branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc
branches/nexuiz-2.0/data/qcsrc/common/util.qh
branches/nexuiz-2.0/data/qcsrc/server/defs.qh
Log:
r6670 | div0 | 2009-05-05 14:54:23 +0200 (Tue, 05 May 2009) | 2 lines
waypointsprites: support v_flipped correctly
r6671 | mand1nga | 2009-05-05 15:42:14 +0200 (Tue, 05 May 2009) | 1 line
Attempt to make the porto beam to not be displayed on spectator mode
r6672 | m0rfar | 2009-05-05 18:47:27 +0200 (Tue, 05 May 2009) | 1 line
Reslimed: Fix a serious item bug found by terencehill.
r6673 | esteel | 2009-05-05 19:28:02 +0200 (Tue, 05 May 2009) | 1 line
added sv_cmd/menu_cmd "records" "maplist lsmaps" "maplist maplist" which work the same as cmd "records" "lsmaps" "maplist"
r6674 | div0 | 2009-05-05 20:10:07 +0200 (Tue, 05 May 2009) | 2 lines
do not draw porto line when dead
r6675 | div0 | 2009-05-05 21:40:27 +0200 (Tue, 05 May 2009) | 2 lines
fix trueaim check for rifle, it accidentally used the rocket's thickness for the bullet
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-05-05 19:40:27 UTC (rev 6675)
+++ branches/nexuiz-2.0/.patchsets 2009-05-05 19:44:23 UTC (rev 6676)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6549,6552-6567,6572-6582,6585-6589,6592-6593,6597-6629,6632-6660,6662-6662,6664-6668
+revisions_applied = 1-6549,6552-6567,6572-6582,6585-6589,6592-6593,6597-6629,6632-6660,6662-6662,6664-6675
Modified: branches/nexuiz-2.0/data/maps/reslimed.bsp
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/maps/reslimed.map
===================================================================
--- branches/nexuiz-2.0/data/maps/reslimed.map 2009-05-05 19:40:27 UTC (rev 6675)
+++ branches/nexuiz-2.0/data/maps/reslimed.map 2009-05-05 19:44:23 UTC (rev 6676)
@@ -23357,6 +23357,7 @@
{
"classname" "item_strength"
"origin" "-1344.000000 -64.000000 -264.000000"
+"spawnflags" "1"
}
// entity 86
{
Modified: branches/nexuiz-2.0/data/qcsrc/client/View.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/View.qc 2009-05-05 19:40:27 UTC (rev 6675)
+++ branches/nexuiz-2.0/data/qcsrc/client/View.qc 2009-05-05 19:44:23 UTC (rev 6676)
@@ -11,8 +11,14 @@
vector p, dir, ang, q, nextdir;
float idx, portal_number, portal1_idx;
- if(activeweapon != WEP_PORTO)
+ if(activeweapon != WEP_PORTO || spectatee_status)
return;
+ if(intermission == 1)
+ return;
+ if(intermission == 2)
+ return;
+ if (getstati(STAT_HEALTH) <= 0)
+ return;
dir = view_forward;
@@ -108,7 +114,7 @@
float drawtime;
float tan(float x)
-{
+{
return sin(x) / cos(x);
}
float atan2(float y, float x)
@@ -213,10 +219,11 @@
case WEP_PORTO: // shoots from eye
case WEP_HOOK: // no trueaim
case WEP_GRENADE_LAUNCHER: // toss curve
- return 1;
+ return 1;
case WEP_CAMPINGRIFLE:
if(zoomscript_caught)
return 1; // shoots from eye when zoomed
+ break;
case WEP_ROCKET_LAUNCHER: // projectile has a size!
mi = '-3 -3 -3';
ma = '3 3 3';
@@ -236,15 +243,16 @@
vecs_y = -vecs_y;
else
vecs = '0 0 0';
-
+
w_shotorg = view_origin + view_right * vecs_y + view_up * vecs_z;
// now move the vecs forward as much as requested if possible
traceline(w_shotorg, w_shotorg + view_forward * (vecs_x + nudge), MOVE_NORMAL, trueaim); // FIXME this MOVE_NORMAL part will misbehave a little in csqc
w_shotorg = trace_endpos - view_forward * nudge;
-
+
// now test whether we will actually hit the trueaimpoint...
tracebox(w_shotorg, mi, ma, trueaimpoint, MOVE_NOMONSTERS, trueaim);
+
return vlen(trace_endpos - trueaimpoint) <= vlen(ma - mi) + 1;
// yes, this is an ugly hack... but it seems good enough to find out whether the test hits the same place as the initial trace
}
@@ -314,7 +322,7 @@
// might even be better to add the gametype to TE_CSQC_INIT...?
if(!postinit)
PostInit();
-
+
CheckForGamestartChange();
maptimeAnnouncer();
@@ -337,7 +345,7 @@
ignore_minus_zoom += 1;
}
}
-
+
sbar_alpha_fg = cvar("sbar_alpha_fg" );
sbar_hudselector = cvar("sbar_hudselector");
ColorTranslateMode = cvar("cl_stripcolorcodes");
@@ -388,17 +396,17 @@
{
// Enable required Darkplaces cvars
chase_active_backup = cvar("chase_active");
- cvar_set("chase_active", "2");
+ cvar_set("chase_active", "2");
cvar_set("cl_demo_mousegrab", "1");
camera_active = TRUE;
camera_mode = FALSE;
}
-
+
// Draw the Crosshair
float scoreboard_active;
scoreboard_active = Sbar_WouldDrawScoreboard();
R_SetView(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden
-
+
// Draw the Engine Status Bar (the default Quake HUD)
R_SetView(VF_DRAWENGINESBAR, 0);
@@ -437,7 +445,7 @@
// as long as the ctf part isn't in, this is useless
if(menu_visible)
menu_show();
-
+
/*if(gametype == GAME_CTF)
{
ctf_view();
@@ -449,7 +457,7 @@
if(self.draw2d)
self.draw2d();
self = e;
-
+
// draw radar
if(
ons_showmap
@@ -521,7 +529,7 @@
}
wcross_name = strcat("gfx/crosshair", wcross_style);
-
+
wcross_size = drawgetimagesize(wcross_name);
wcross_size_x *= wcross_sizefloat;
wcross_size_y *= wcross_sizefloat;
Modified: branches/nexuiz-2.0/data/qcsrc/client/waypointsprites.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/waypointsprites.qc 2009-05-05 19:40:27 UTC (rev 6675)
+++ branches/nexuiz-2.0/data/qcsrc/client/waypointsprites.qc 2009-05-05 19:44:23 UTC (rev 6676)
@@ -137,6 +137,9 @@
//d = o - '0.5 0 0' * vid_conwidth - '0 0.5 0' * vid_conheight;
+ if(cvar("v_flipped"))
+ d_x = -d_x;
+
f1 = d_x / vid_conwidth;
f2 = d_y / vid_conheight;
Modified: branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc 2009-05-05 19:40:27 UTC (rev 6675)
+++ branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc 2009-05-05 19:44:23 UTC (rev 6676)
@@ -206,7 +206,10 @@
print(" maplist remove map\n");
print(" maplist shuffle\n");
print(" maplist cleanup\n");
+ print(" maplist maplist\n");
+ print(" maplist lsmaps\n");
print(" addtolist variable addedvalue\n");
+ print(" records\n");
return TRUE;
}
@@ -261,6 +264,14 @@
cvar_set("g_maplist", s2);
return TRUE;
}
+ else if(argv(1) == "maplist") {
+ print(maplist_reply);
+ return TRUE;
+ }
+ else if(argv(1) == "lsmaps") {
+ print(lsmaps_reply);
+ return TRUE;
+ }
}
else if(argc >= 3 && argv(0) == "red")
{
@@ -789,6 +800,10 @@
}
}
return TRUE;
+ }
+ else if(argv(0) == "records") {
+ print(records_reply);
+ return TRUE;
#ifdef MENUQC
} else if(argv(0) == "cp") {
if(argc >= 2)
Modified: branches/nexuiz-2.0/data/qcsrc/common/util.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/util.qh 2009-05-05 19:40:27 UTC (rev 6675)
+++ branches/nexuiz-2.0/data/qcsrc/common/util.qh 2009-05-05 19:44:23 UTC (rev 6676)
@@ -158,3 +158,5 @@
float compressShotOrigin(vector v);
vector decompressShotOrigin(float f);
+
+string records_reply, lsmaps_reply, maplist_reply; // cached replies
Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2009-05-05 19:40:27 UTC (rev 6675)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2009-05-05 19:44:23 UTC (rev 6676)
@@ -15,8 +15,6 @@
// Globals
-string records_reply, lsmaps_reply, maplist_reply; // cached replies
-
float ctf_score_value(string parameter);
float g_dm, g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms, g_runematch, g_race;
More information about the nexuiz-commits
mailing list