r5573 - in trunk/data: . gfx qcsrc/client
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Jan 16 10:21:08 EST 2009
Author: div0
Date: 2009-01-16 10:21:04 -0500 (Fri, 16 Jan 2009)
New Revision: 5573
Added:
trunk/data/gfx/crosshaircampingrifle.tga
trunk/data/gfx/crosshaircrylink.tga
trunk/data/gfx/crosshairelectro.tga
trunk/data/gfx/crosshairgrenadelauncher.tga
trunk/data/gfx/crosshairhagar.tga
trunk/data/gfx/crosshairhlac.tga
trunk/data/gfx/crosshairhook.tga
trunk/data/gfx/crosshairlaser.tga
trunk/data/gfx/crosshairminstanex.tga
trunk/data/gfx/crosshairnex.tga
trunk/data/gfx/crosshairporto.tga
trunk/data/gfx/crosshairrocketlauncher.tga
trunk/data/gfx/crosshairseeker.tga
trunk/data/gfx/crosshairshotgun.tga
trunk/data/gfx/crosshairuzi.tga
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/client/View.qc
Log:
per-weapon crosshair images; too bad these are a failure, and need to be redone at a higher resolution
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-01-16 14:06:45 UTC (rev 5572)
+++ trunk/data/defaultNexuiz.cfg 2009-01-16 15:21:04 UTC (rev 5573)
@@ -87,96 +87,96 @@
crosshair 5
seta crosshair_per_weapon 0
seta crosshair_color_override 0 // when 1, crosshair_color_* overrides the per-weapon color
-seta crosshair_laser 15
+seta crosshair_laser ""
seta crosshair_laser_color_red 1
seta crosshair_laser_color_green 0.65
-seta crosshair_laser_color_blue 0.65
+seta crosshair_laser_color_blue 0.2
seta crosshair_laser_color_alpha 0.75
-seta crosshair_laser_size 0.75
-seta crosshair_shotgun 8
+seta crosshair_laser_size 1
+seta crosshair_shotgun ""
seta crosshair_shotgun_color_red 0.75
seta crosshair_shotgun_color_green 0.75
seta crosshair_shotgun_color_blue 0.75
seta crosshair_shotgun_color_alpha 1
-seta crosshair_shotgun_size 1.25
-seta crosshair_uzi 19
+seta crosshair_shotgun_size 1
+seta crosshair_uzi ""
seta crosshair_uzi_color_red 1
seta crosshair_uzi_color_green 1
-seta crosshair_uzi_color_blue 0.85
+seta crosshair_uzi_color_blue 0.2
seta crosshair_uzi_color_alpha 1
-seta crosshair_uzi_size 1.35
-seta crosshair_grenadelauncher 4
-seta crosshair_grenadelauncher_color_red 0.85
-seta crosshair_grenadelauncher_color_green 1
-seta crosshair_grenadelauncher_color_blue 0.85
+seta crosshair_uzi_size 1
+seta crosshair_grenadelauncher ""
+seta crosshair_grenadelauncher_color_red 1
+seta crosshair_grenadelauncher_color_green 0.2
+seta crosshair_grenadelauncher_color_blue 0.2
seta crosshair_grenadelauncher_color_alpha 1
-seta crosshair_grenadelauncher_size 1.15
-seta crosshair_electro 3
+seta crosshair_grenadelauncher_size 1
+seta crosshair_electro ""
seta crosshair_electro_color_red 0.35
seta crosshair_electro_color_green 0.5
seta crosshair_electro_color_blue 1
seta crosshair_electro_color_alpha 0.90
seta crosshair_electro_size 1
-seta crosshair_crylink 1
+seta crosshair_crylink ""
seta crosshair_crylink_color_red 0.85
seta crosshair_crylink_color_green 0.25
seta crosshair_crylink_color_blue 1
seta crosshair_crylink_color_alpha 0.85
-seta crosshair_crylink_size 0.9
-seta crosshair_nex 9
+seta crosshair_crylink_size 1
+seta crosshair_nex ""
seta crosshair_nex_color_red 0
seta crosshair_nex_color_green 1
seta crosshair_nex_color_blue 1
seta crosshair_nex_color_alpha 0.85
-seta crosshair_nex_size 0.65
-seta crosshair_hagar 11
+seta crosshair_nex_size 1
+seta crosshair_hagar ""
seta crosshair_hagar_color_red 1
seta crosshair_hagar_color_green 0.75
seta crosshair_hagar_color_blue 0.5
seta crosshair_hagar_color_alpha 1
-seta crosshair_hagar_size 1.25
-seta crosshair_rocketlauncher 10
+seta crosshair_hagar_size 1
+seta crosshair_rocketlauncher ""
seta crosshair_rocketlauncher_color_red 1
seta crosshair_rocketlauncher_color_green 0.85
-seta crosshair_rocketlauncher_color_blue 0.85
+seta crosshair_rocketlauncher_color_blue 0.2
seta crosshair_rocketlauncher_color_alpha 1
-seta crosshair_rocketlauncher_size 1.35
-seta crosshair_porto 16
+seta crosshair_rocketlauncher_size 1
+seta crosshair_porto ""
seta crosshair_porto_color_red 0.5
seta crosshair_porto_color_green 1
seta crosshair_porto_color_blue 0.5
seta crosshair_porto_color_alpha 0.85
-seta crosshair_porto_size 1.5
-seta crosshair_minstanex 12
+seta crosshair_porto_size 1
+seta crosshair_minstanex ""
seta crosshair_minstanex_color_red 0.65
seta crosshair_minstanex_color_green 0.65
seta crosshair_minstanex_color_blue 1
seta crosshair_minstanex_color_alpha 1
-seta crosshair_minstanex_size 0.35
-seta crosshair_hook 13
+seta crosshair_minstanex_size 1
+seta crosshair_hook ""
seta crosshair_hook_color_red 0.65
seta crosshair_hook_color_green 1
seta crosshair_hook_color_blue 0.85
seta crosshair_hook_color_alpha 0.85
-seta crosshair_hook_size 1.25
-seta crosshair_hlac 13
-seta crosshair_hlac_color_red 0.85
-seta crosshair_hlac_color_green 0.75
-seta crosshair_hlac_color_blue 0.75
+seta crosshair_hook_size 1
+seta crosshair_hlac ""
+seta crosshair_hlac_color_red 1
+seta crosshair_hlac_color_green 0.65
+seta crosshair_hlac_color_blue 0.2
seta crosshair_hlac_color_alpha 1
-seta crosshair_hlac_size 2
-seta crosshair_seeker 19
+seta crosshair_hlac_size 1
+seta crosshair_seeker ""
seta crosshair_seeker_color_red 1
seta crosshair_seeker_color_green 0.35
seta crosshair_seeker_color_blue 0.35
seta crosshair_seeker_color_alpha 0.9
-seta crosshair_seeker_size 2
-seta crosshair_campingrifle 7
-seta crosshair_campingrifle_color_red 0.5
-seta crosshair_campingrifle_color_green 0.85
-seta crosshair_campingrifle_color_blue 0.5
+seta crosshair_seeker_size 1
+seta crosshair_campingrifle ""
+seta crosshair_campingrifle_color_red 1
+seta crosshair_campingrifle_color_green 1
+seta crosshair_campingrifle_color_blue 0.2
seta crosshair_campingrifle_color_alpha 1
-seta crosshair_campingrifle_size 2
+seta crosshair_campingrifle_size 1
fov 90
seta cl_zoomfactor 5 // how much +zoom will zoom (1-16)
seta cl_zoomspeed 3.5 // how fast it will zoom (0.5-16), negative values mean instant zoom
Added: trunk/data/gfx/crosshaircampingrifle.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshaircampingrifle.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshaircrylink.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshaircrylink.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairelectro.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairelectro.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairgrenadelauncher.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairgrenadelauncher.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairhagar.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairhagar.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairhlac.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairhlac.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairhook.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairhook.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairlaser.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairlaser.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairminstanex.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairminstanex.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairnex.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairnex.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairporto.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairporto.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairrocketlauncher.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairrocketlauncher.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairseeker.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairseeker.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairshotgun.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairshotgun.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/crosshairuzi.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/crosshairuzi.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc 2009-01-16 14:06:45 UTC (rev 5572)
+++ trunk/data/qcsrc/client/View.qc 2009-01-16 15:21:04 UTC (rev 5573)
@@ -443,12 +443,13 @@
// crosshair
if(!scoreboard_active && !ons_showmap) {
string wcross_wep;
- float wcross_alpha, wcross_style;
+ float wcross_alpha;
+ string wcross_style;
vector wcross_color, wcross_size;
float wcross_sizefloat;
string wcross_name;
- wcross_style = cvar("crosshair");
+ wcross_style = cvar_string("crosshair");
wcross_color_x = cvar("crosshair_color_red");
wcross_color_y = cvar("crosshair_color_green");
wcross_color_z = cvar("crosshair_color_blue");
@@ -459,22 +460,24 @@
e = get_weaponinfo(activeweapon);
if (e && e.netname != "")
{
- wcross_wep = strcat("_", e.netname);
- wcross_style = cvar(strcat("crosshair", wcross_wep));
+ wcross_wep = e.netname;
+ wcross_style = cvar_string(strcat("crosshair_", wcross_wep));
+ if(wcross_style == "")
+ wcross_style = e.netname;
if(!cvar("crosshair_color_override"))
{
- wcross_color_x = cvar(strcat("crosshair", wcross_wep, "_color_red"));
- wcross_color_y = cvar(strcat("crosshair", wcross_wep, "_color_green"));
- wcross_color_z = cvar(strcat("crosshair", wcross_wep, "_color_blue"));
+ wcross_color_x = cvar(strcat("crosshair_", wcross_wep, "_color_red"));
+ wcross_color_y = cvar(strcat("crosshair_", wcross_wep, "_color_green"));
+ wcross_color_z = cvar(strcat("crosshair_", wcross_wep, "_color_blue"));
}
- wcross_alpha *= cvar(strcat("crosshair", wcross_wep, "_color_alpha"));
- wcross_sizefloat *= cvar(strcat("crosshair", wcross_wep, "_size"));
+ wcross_alpha *= cvar(strcat("crosshair_", wcross_wep, "_color_alpha"));
+ wcross_sizefloat *= cvar(strcat("crosshair_", wcross_wep, "_size"));
}
}
- wcross_name = strcat("gfx/crosshair", ftos(wcross_style));
+ wcross_name = strcat("gfx/crosshair", wcross_style);
wcross_size = drawgetimagesize(wcross_name);
wcross_size_x *= wcross_sizefloat;
More information about the nexuiz-commits
mailing list