ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-10 07:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

o cl_customcrosshair now has values 0|1|2|3|4

Browse source 
o Value 0 is the current 3.1 NS crosshair sets
o Value 1 is the default value
o The game now supports crosshair resolution of 1600, though no sprites are provided.


git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@468 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
puzl 2006-05-08 22:21:53 +00:00
parent 4b61e6873e
commit dc78814b90
26 changed files with 228 additions and 287 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
releases/3.2.0/source/cl_dll/ammo.cpp
View file

@ -91,10 +91,11 @@ void WeaponsResource::Reset( void )
void WeaponsResource :: LoadAllWeaponSprites( void )
{
int customCrosshairs=CVAR_GET_FLOAT(kvCustomCrosshair);
for (int i = 0; i < MAX_WEAPONS; i++)
{
if ( rgWeapons[i].iId )
LoadWeaponSprites( &rgWeapons[i] );
LoadWeaponSprites( &rgWeapons[i], customCrosshairs );
}
}
@ -118,10 +119,13 @@ inline void LoadWeaponSprite( client_sprite_t* ptr, HSPRITE& sprite, wrect_t& bo
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
void WeaponsResource :: LoadWeaponSprites( WEAPON *pWeapon )
void WeaponsResource :: LoadWeaponSprites( WEAPON *pWeapon, int custom )
{
int resolutions[5] = { 320, 640, 800, 1024, 1280 };
const int numRes=5;
if ( custom < 0 || custom > 4 )
custom=1;
int resolutions[6] = { 320, 640, 800, 1024, 1280, 1600};
const int numRes=6;
int i=0, j=0, iRes=320;
int screenWidth=ScreenWidth();
@ -141,10 +145,12 @@ void WeaponsResource :: LoadWeaponSprites( WEAPON *pWeapon )
if ( !pWeapon )
return;
memset( &pWeapon->rcCrosshair, 0, sizeof(wrect_t) );
memset( &pWeapon->rcActive, 0, sizeof(wrect_t) );
memset( &pWeapon->rcInactive, 0, sizeof(wrect_t) );
memset( &pWeapon->rcAmmo, 0, sizeof(wrect_t) );
memset( &pWeapon->rcAmmo2, 0, sizeof(wrect_t) );
pWeapon->hCrosshair =0;
pWeapon->hInactive = 0;
pWeapon->hActive = 0;
pWeapon->hAmmo = 0;
@ -159,19 +165,15 @@ void WeaponsResource :: LoadWeaponSprites( WEAPON *pWeapon )
return;
}
char crosshairName[32];
sprintf(crosshairName, "crosshair_%d", custom);
for ( j=numRes-1; j>=0; j-- ) {
if ( resolutions[j] <= iRes ) {
if( pWeapon->hCrosshair == NULL )
LoadWeaponSprite( GetSpriteList( pList, "crosshair", resolutions[j], i ), pWeapon->hCrosshair, pWeapon->rcCrosshair );
LoadWeaponSprite( GetSpriteList( pList, crosshairName, resolutions[j], i ), pWeapon->hCrosshair, pWeapon->rcCrosshair );
if( pWeapon->hCrosshair == NULL && custom != 0 )
LoadWeaponSprite( GetSpriteList( pList, "crosshair_0", resolutions[j], i ), pWeapon->hCrosshair, pWeapon->rcCrosshair );
if( pWeapon->hCrosshair1 == NULL )
LoadWeaponSprite( GetSpriteList( pList, "crosshair_1", resolutions[j], i ), pWeapon->hCrosshair1, pWeapon->rcCrosshair1 );
if( pWeapon->hCrosshair2 == NULL )
LoadWeaponSprite( GetSpriteList( pList, "crosshair_2", resolutions[j], i ), pWeapon->hCrosshair2, pWeapon->rcCrosshair2 );
if( pWeapon->hCrosshair3 == NULL )
LoadWeaponSprite( GetSpriteList( pList, "crosshair_3", resolutions[j], i ), pWeapon->hCrosshair3, pWeapon->rcCrosshair3 );
if( pWeapon->hInactive == NULL )
LoadWeaponSprite( GetSpriteList( pList, "weapon", resolutions[j], i ), pWeapon->hInactive, pWeapon->rcInactive );
@ -187,24 +189,6 @@ void WeaponsResource :: LoadWeaponSprites( WEAPON *pWeapon )
}
}
if( pWeapon->hCrosshair1 == NULL ) //default
{
pWeapon->hCrosshair1 = pWeapon->hCrosshair;
pWeapon->rcCrosshair1 = pWeapon->rcCrosshair;
}
if( pWeapon->hCrosshair2 == NULL ) //default
{
pWeapon->hCrosshair2 = pWeapon->hCrosshair;
pWeapon->rcCrosshair2 = pWeapon->rcCrosshair;
}
if( pWeapon->hCrosshair3 == NULL ) //default
{
pWeapon->hCrosshair3 = pWeapon->hCrosshair;
pWeapon->rcCrosshair3 = pWeapon->rcCrosshair;
}
if( pWeapon->hActive || pWeapon->hInactive || pWeapon->hAmmo || pWeapon->hAmmo2 )
{ gHR.iHistoryGap = max( gHR.iHistoryGap, pWeapon->rcActive.bottom - pWeapon->rcActive.top ); }
}
@ -337,8 +321,9 @@ HSPRITE* WeaponsResource::GetAmmoPicFromWeapon( int iAmmoId, wrect_t& rect )
void WeaponsResource::AddWeapon( WEAPON *wp )
{
int customCrosshairs=CVAR_GET_FLOAT(kvCustomCrosshair);
rgWeapons[ wp->iId ] = *wp;
LoadWeaponSprites( &rgWeapons[ wp->iId ] );
LoadWeaponSprites( &rgWeapons[ wp->iId ], customCrosshairs);
}
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -692,23 +677,8 @@ void CHudAmmo::Think(void)
m_customCrosshair=(int)CVAR_GET_FLOAT(kvCustomCrosshair);
WEAPON* currentWeapon = gWR.GetWeapon(gHUD.GetCurrentWeaponID());
if ( currentWeapon ) {
switch (m_customCrosshair) {
case 0:
gHUD.SetCurrentCrosshair(currentWeapon->hCrosshair, currentWeapon->rcCrosshair, 255, 255, 255);
break;
case 1:
gHUD.SetCurrentCrosshair(currentWeapon->hCrosshair1, currentWeapon->rcCrosshair1, 255, 255, 255);
break;
case 2:
gHUD.SetCurrentCrosshair(currentWeapon->hCrosshair2, currentWeapon->rcCrosshair2, 255, 255, 255);
break;
case 3:
gHUD.SetCurrentCrosshair(currentWeapon->hCrosshair3, currentWeapon->rcCrosshair3, 255, 255, 255);
break;
default:
gHUD.SetCurrentCrosshair(currentWeapon->hCrosshair, currentWeapon->rcCrosshair, 255, 255, 255);
break;
}
gWR.LoadWeaponSprites(currentWeapon, m_customCrosshair);
gHUD.SetCurrentCrosshair(currentWeapon->hCrosshair, currentWeapon->rcCrosshair, 255, 255, 255);
}
}
@ -859,23 +829,7 @@ int CHudAmmo::MsgFunc_CurWeapon(const char *pszName, int iSize, void *pbuf )
if ( !(gHUD.m_iHideHUDDisplay & ( HIDEHUD_WEAPONS | HIDEHUD_ALL )) )
{
switch ((int)CVAR_GET_FLOAT(kvCustomCrosshair)) {
case 0:
gHUD.SetCurrentCrosshair(m_pWeapon->hCrosshair, m_pWeapon->rcCrosshair, 255, 255, 255);
break;
case 1:
gHUD.SetCurrentCrosshair(m_pWeapon->hCrosshair1, m_pWeapon->rcCrosshair1, 255, 255, 255);
break;
case 2:
gHUD.SetCurrentCrosshair(m_pWeapon->hCrosshair2, m_pWeapon->rcCrosshair2, 255, 255, 255);
break;
case 3:
gHUD.SetCurrentCrosshair(m_pWeapon->hCrosshair3, m_pWeapon->rcCrosshair3, 255, 255, 255);
break;
default:
gHUD.SetCurrentCrosshair(m_pWeapon->hCrosshair, m_pWeapon->rcCrosshair, 255, 255, 255);
break;
}
gHUD.SetCurrentCrosshair(m_pWeapon->hCrosshair, m_pWeapon->rcCrosshair, 255, 255, 255);
/* if ( gHUD.m_iFOV >= 90 )
{ // normal crosshairs

6
releases/3.2.0/source/cl_dll/ammo.h
View file

@ -48,12 +48,6 @@ struct WEAPON
wrect_t rcAmmo2;
HSPRITE hCrosshair;
wrect_t rcCrosshair;
HSPRITE hCrosshair1;
wrect_t rcCrosshair1;
HSPRITE hCrosshair2;
wrect_t rcCrosshair2;
HSPRITE hCrosshair3;
wrect_t rcCrosshair3;
/* HSPRITE hAutoaim;
wrect_t rcAutoaim;

2
releases/3.2.0/source/cl_dll/ammohistory.h
View file

@ -38,7 +38,7 @@ public:
void Init( void );
void Reset( void );
void LoadWeaponSprites( WEAPON* wp );
void LoadWeaponSprites( WEAPON* wp, int custom );
void LoadAllWeaponSprites( void );
WEAPON* GetWeapon( int iId );

2
releases/3.2.0/source/cl_dll/hud.cpp
View file

@ -209,7 +209,7 @@ void CHud :: Init( void )
CVAR_CREATE( "cl_showspeed", "0", 0);
CVAR_CREATE( kvLabelMaps, "1", FCVAR_ARCHIVE);
CVAR_CREATE( kvGammaRamp, "1", FCVAR_ARCHIVE);
CVAR_CREATE( kvCustomCrosshair, "0", FCVAR_ARCHIVE);
CVAR_CREATE( kvCustomCrosshair, "1", FCVAR_ARCHIVE);
CVAR_CREATE( kvLabelHivesight, "1", FCVAR_ARCHIVE);
CVAR_CREATE( "cl_iconr", "0", FCVAR_ARCHIVE);
CVAR_CREATE( "cl_icong", "149", FCVAR_ARCHIVE);

4
releases/3.2.0/sprites/weapon_acidrocketgun.txt
View file

@ -2,8 +2,8 @@
weapon 320 320w 0 180 80 20
weapon_s 320 320w-s 0 180 80 20
ammo 320 640hud7 96 96 24 24
crosshair 320 xhairacid 0 0 128 128
crosshair_0 320 xhairacid 0 0 128 128
weapon 640 640aw4 0 90 170 45
weapon_s 640 640aw4-s 0 90 170 45
ammo 640 640hud7 96 96 24 24
crosshair 640 xhairacid 0 0 128 128
crosshair_0 640 xhairacid 0 0 128 128

6
releases/3.2.0/sprites/weapon_bilebombgun.txt
View file

@ -1,9 +1,9 @@
10
8
weapon 320 320w 0 40 80 20
weapon_s 320 320w-s 0 40 80 20
ammo 320 320hud2 0 16 18 18
crosshair 320 xhairbile 0 0 128 64
crosshair_0 320 xhairbile 0 0 128 64
weapon 640 640aw4 0 0 170 45
weapon_s 640 640aw4-s 0 0 170 45
ammo 640 640hud7 0 72 24 24
crosshair 640 xhairbile 0 0 128 64
crosshair_0 640 xhairbile 0 0 128 64

4
releases/3.2.0/sprites/weapon_blink.txt
View file

@ -1,9 +1,7 @@
8
6
weapon 320 320w 0 80 80 20
weapon_s 320 320w-s 0 80 80 20
ammo 320 640hud7 96 96 24 24
autoaim 320 crosshairs 0 72 24 24
weapon 640 640aw3 0 45 170 45
weapon_s 640 640aw3-s 0 45 170 45
ammo 640 640hud7 96 96 24 24
autoaim 640 crosshairs 0 72 24 24

40
releases/3.2.0/sprites/weapon_grenade.txt
View file

@ -5,23 +5,23 @@ ammo 320 640hud7 72 96 24 24
weapon 640 640mw1 0 180 170 45
weapon_s 640 640mw1-s 0 180 170 45
ammo 640 640hud7 72 96 24 24
crosshair 320 xhairmw1 0 0 40 40
crosshair_1 320 xhairmw2 0 0 40 40
crosshair_2 320 xhairmw3 0 0 40 40
crosshair_3 320 xhairmw4 0 0 40 40
crosshair 640 xhairmw1 0 0 40 40
crosshair_1 640 xhairmw2 0 0 40 40
crosshair_2 640 xhairmw3 0 0 40 40
crosshair_3 640 xhairmw4 0 0 40 40
crosshair 800 xhairmw1 40 0 50 50
crosshair_1 800 xhairmw2 40 0 50 50
crosshair_2 800 xhairmw3 40 0 50 50
crosshair_3 800 xhairmw4 40 0 50 50
crosshair 1024 xhairmw1 90 0 64 64
crosshair_1 1024 xhairmw2 90 0 64 64
crosshair_2 1024 xhairmw3 90 0 64 64
crosshair_3 1024 xhairmw4 90 0 64 64
crosshair 1280 xhairmw1 154 0 80 80
crosshair_1 1280 xhairmw2 154 0 80 80
crosshair_2 1280 xhairmw3 154 0 80 80
crosshair_3 1280 xhairmw4 154 0 80 80
crosshair_1 320 xhairmw1 0 0 40 40
crosshair_2 320 xhairmw2 0 0 40 40
crosshair_3 320 xhairmw3 0 0 40 40
crosshair_4 320 xhairmw4 0 0 40 40
crosshair_1 640 xhairmw1 0 0 40 40
crosshair_2 640 xhairmw2 0 0 40 40
crosshair_3 640 xhairmw3 0 0 40 40
crosshair_4 640 xhairmw4 0 0 40 40
crosshair_1 800 xhairmw1 40 0 50 50
crosshair_2 800 xhairmw2 40 0 50 50
crosshair_3 800 xhairmw3 40 0 50 50
crosshair_4 800 xhairmw4 40 0 50 50
crosshair_1 1024 xhairmw1 90 0 64 64
crosshair_2 1024 xhairmw2 90 0 64 64
crosshair_3 1024 xhairmw3 90 0 64 64
crosshair_4 1024 xhairmw4 90 0 64 64
crosshair_1 1280 xhairmw1 154 0 80 80
crosshair_2 1280 xhairmw2 154 0 80 80
crosshair_3 1280 xhairmw3 154 0 80 80
crosshair_4 1280 xhairmw4 154 0 80 80

16
releases/3.2.0/sprites/weapon_grenadegun.txt
View file

@ -1,11 +1,17 @@
10
16
weapon 320 320w 160 120 80 20
weapon_s 320 320w-s 160 120 80 20
ammo 320 640hud7 72 96 24 24
crosshair 320 xhairgl 0 0 64 64
autoaim 320 crosshairs 0 0 24 24
crosshair_0 320 xhairgl 0 0 64 64
crosshair_1 320 xhairgl 0 0 64 64
crosshair_2 320 xhairgl 0 0 64 64
crosshair_3 320 xhairgl 0 0 64 64
crosshair_4 320 xhairgl 0 0 64 64
weapon 640 640mw1 0 0 170 45
weapon_s 640 640mw1-s 0 0 170 45
ammo 640 640hud7 72 96 24 24
crosshair 640 xhairgl 0 0 64 0
autoaim 640 crosshairs 0 72 24 24
crosshair_0 640 xhairgl 0 0 64 0
crosshair_1 640 xhairgl 0 0 64 0
crosshair_2 640 xhairgl 0 0 64 0
crosshair_3 640 xhairgl 0 0 64 0
crosshair_4 640 xhairgl 0 0 64 0

2
releases/3.2.0/sprites/weapon_healingspray.txt
View file

@ -1,4 +1,4 @@
8
6
weapon 320 320w 0 200 80 20
weapon_s 320 320w-s 0 200 80 20
ammo 320 640hud7 96 96 24 24

43
releases/3.2.0/sprites/weapon_heavymachinegun.txt
View file

@ -1,27 +1,28 @@
26
27
weapon 320 320w 160 100 80 20
weapon_s 320 320w-s 160 100 80 20
ammo 320 640hud7 0 96 24 24
weapon 640 640mw2 0 45 170 45
weapon_s 640 640mw2-s 0 45 170 45
ammo 640 640hud7 0 96 24 24
crosshair 320 xhairmw1 0 160 40 40
crosshair_1 320 xhairmw2 0 160 40 40
crosshair_2 320 xhairmw3 0 160 40 40
crosshair_3 320 xhairmw4 0 160 40 40
crosshair 640 xhairmw1 0 160 40 40
crosshair_1 640 xhairmw2 0 160 40 40
crosshair_2 640 xhairmw3 0 160 40 40
crosshair_3 640 xhairmw4 0 160 40 40
crosshair 800 xhairmw1 40 160 50 50
crosshair_1 800 xhairmw2 40 160 50 50
crosshair_2 800 xhairmw3 40 160 50 50
crosshair_3 800 xhairmw4 40 160 50 50
crosshair 1024 xhairmw1 90 160 64 64
crosshair_1 1024 xhairmw2 90 160 64 64
crosshair_2 1024 xhairmw3 90 160 64 64
crosshair_3 1024 xhairmw4 90 160 64 64
crosshair 1280 xhairmw1 154 160 80 80
crosshair_1 1280 xhairmw2 154 160 80 80
crosshair_2 1280 xhairmw3 154 160 80 80
crosshair_3 1280 xhairmw4 154 160 80 80
crosshair_0 320 xhairhmg 0 0 64 64
crosshair_1 320 xhairmw1 0 160 40 40
crosshair_2 320 xhairmw2 0 160 40 40
crosshair_3 320 xhairmw3 0 160 40 40
crosshair_4 320 xhairmw4 0 160 40 40
crosshair_1 640 xhairmw1 0 160 40 40
crosshair_2 640 xhairmw2 0 160 40 40
crosshair_3 640 xhairmw3 0 160 40 40
crosshair_4 640 xhairmw4 0 160 40 40
crosshair_1 800 xhairmw1 40 160 50 50
crosshair_2 800 xhairmw2 40 160 50 50
crosshair_3 800 xhairmw3 40 160 50 50
crosshair_4 800 xhairmw4 40 160 50 50
crosshair_1 1024 xhairmw1 90 160 64 64
crosshair_2 1024 xhairmw2 90 160 64 64
crosshair_3 1024 xhairmw3 90 160 64 64
crosshair_4 1024 xhairmw4 90 160 64 64
crosshair_1 1280 xhairmw1 154 160 80 80
crosshair_2 1280 xhairmw2 154 160 80 80
crosshair_3 1280 xhairmw3 154 160 80 80
crosshair_4 1280 xhairmw4 154 160 80 80

42
releases/3.2.0/sprites/weapon_knife.txt
View file

@ -1,28 +1,28 @@
26
27
weapon 320 320w 160 140 80 20
weapon_s 320 320w-s 160 140 80 20
ammo 320 320hud2 0 16 18 18
weapon 640 640mw1 0 135 170 45
weapon_s 640 640mw1-s 0 135 170 45
ammo 640 640hud7 0 72 24 24
crosshair 320 xhairmw1 0 0 40 40
crosshair_1 320 xhairmw2 0 0 40 40
crosshair_2 320 xhairmw3 0 0 40 40
crosshair_3 320 xhairmw4 0 0 40 40
crosshair 640 xhairmw1 0 0 40 40
crosshair_1 640 xhairmw2 0 0 40 40
crosshair_2 640 xhairmw3 0 0 40 40
crosshair_3 640 xhairmw4 0 0 40 40
crosshair 800 xhairmw1 40 0 50 50
crosshair_1 800 xhairmw2 40 0 50 50
crosshair_2 800 xhairmw3 40 0 50 50
crosshair_3 800 xhairmw4 40 0 50 50
crosshair 1024 xhairmw1 90 0 64 64
crosshair_1 1024 xhairmw2 90 0 64 64
crosshair_2 1024 xhairmw3 90 0 64 64
crosshair_3 1024 xhairmw4 90 0 64 64
crosshair 1280 xhairmw1 154 0 80 80
crosshair_1 1280 xhairmw2 154 0 80 80
crosshair_2 1280 xhairmw3 154 0 80 80
crosshair_3 1280 xhairmw4 154 0 80 80
crosshair_1 320 xhairmw1 0 0 40 40
crosshair_2 320 xhairmw2 0 0 40 40
crosshair_3 320 xhairmw3 0 0 40 40
crosshair_4 320 xhairmw4 0 0 40 40
crosshair_1 640 xhairmw1 0 0 40 40
crosshair_2 640 xhairmw2 0 0 40 40
crosshair_3 640 xhairmw3 0 0 40 40
crosshair_4 640 xhairmw4 0 0 40 40
crosshair_1 800 xhairmw1 40 0 50 50
crosshair_2 800 xhairmw2 40 0 50 50
crosshair_3 800 xhairmw3 40 0 50 50
crosshair_4 800 xhairmw4 40 0 50 50
crosshair_1 1024 xhairmw1 90 0 64 64
crosshair_2 1024 xhairmw2 90 0 64 64
crosshair_3 1024 xhairmw3 90 0 64 64
crosshair_4 1024 xhairmw4 90 0 64 64
crosshair_1 1280 xhairmw1 154 0 80 80
crosshair_2 1280 xhairmw2 154 0 80 80
crosshair_3 1280 xhairmw3 154 0 80 80
crosshair_4 1280 xhairmw4 154 0 80 80

52
releases/3.2.0/sprites/weapon_machinegun.txt
View file

@ -1,36 +1,28 @@
35
27
weapon 320 320w 160 0 80 20
weapon_s 320 320w-s 160 0 80 20
ammo 320 640hud7 48 72 24 24
crosshair 320 xhairmw1 0 0 40 40
crosshair_1 320 xhairmw2 0 0 40 40
crosshair_2 320 xhairmw3 0 0 40 40
crosshair_3 320 xhairmw4 0 0 40 40
weapon 640 640mw2 0 180 170 45
weapon_s 640 640mw2-s 0 180 170 45
ammo 640 640hud7 48 72 24 24
crosshair 640 xhairmw1 0 0 40 40
crosshair_1 640 xhairmw2 0 0 40 40
crosshair_2 640 xhairmw3 0 0 40 40
crosshair_3 640 xhairmw4 0 0 40 40
weapon 800 640mw2 0 180 170 45
weapon_s 800 640mw2-s 0 180 170 45
ammo 800 640hud7 48 72 24 24
crosshair 800 xhairmw1 40 0 50 50
crosshair_1 800 xhairmw2 40 0 50 50
crosshair_2 800 xhairmw3 40 0 50 50
crosshair_3 800 xhairmw4 40 0 50 50
weapon 1024 640mw2 0 180 170 45
weapon_s 1024 640mw2-s 0 180 170 45
ammo 1024 640hud7 48 72 24 24
crosshair 1024 xhairmw1 90 0 64 64
crosshair_1 1024 xhairmw2 90 0 64 64
crosshair_2 1024 xhairmw3 90 0 64 64
crosshair_3 1024 xhairmw4 90 0 64 64
weapon 1280 640mw2 0 180 170 45
weapon_s 1280 640mw2-s 0 180 170 45
ammo 1280 640hud7 48 72 24 24
crosshair 1280 xhairmw1 154 0 80 80
crosshair_1 1280 xhairmw2 154 0 80 80
crosshair_2 1280 xhairmw3 154 0 80 80
crosshair_3 1280 xhairmw4 154 0 80 80
crosshair_0 320 xhairmg 0 0 64 64
crosshair_1 320 xhairmw1 0 0 40 40
crosshair_2 320 xhairmw2 0 0 40 40
crosshair_3 320 xhairmw3 0 0 40 40
crosshair_4 320 xhairmw4 0 0 40 40
crosshair_1 640 xhairmw1 0 0 40 40
crosshair_2 640 xhairmw2 0 0 40 40
crosshair_3 640 xhairmw3 0 0 40 40
crosshair_4 640 xhairmw4 0 0 40 40
crosshair_1 800 xhairmw1 40 0 50 50
crosshair_2 800 xhairmw2 40 0 50 50
crosshair_3 800 xhairmw3 40 0 50 50
crosshair_4 800 xhairmw4 40 0 50 50
crosshair_1 1024 xhairmw1 90 0 64 64
crosshair_2 1024 xhairmw2 90 0 64 64
crosshair_3 1024 xhairmw3 90 0 64 64
crosshair_4 1024 xhairmw4 90 0 64 64
crosshair_1 1280 xhairmw1 154 0 80 80
crosshair_2 1280 xhairmw2 154 0 80 80
crosshair_3 1280 xhairmw3 154 0 80 80
crosshair_4 1280 xhairmw4 154 0 80 80

4
releases/3.2.0/sprites/weapon_metabolize.txt
View file

@ -1,9 +1,7 @@
8
6
weapon 320 320w 0 200 80 20
weapon_s 320 320w-s 0 200 80 20
ammo 320 640hud7 96 96 24 24
autoaim 320 crosshairs 0 72 24 24
weapon 640 640aw3 0 180 170 45
weapon_s 640 640aw3-s 0 180 170 45
ammo 640 640hud7 96 96 24 24
autoaim 640 crosshairs 0 72 24 24

40
releases/3.2.0/sprites/weapon_mine.txt
View file

@ -5,23 +5,23 @@ ammo 320 640hud7 96 96 24 24
weapon 640 640mw2 0 0 170 45
weapon_s 640 640mw2-s 0 0 170 45
ammo 640 640hud7 96 96 24 24
crosshair 320 xhairmw1 0 0 40 40
crosshair_1 320 xhairmw2 0 0 40 40
crosshair_2 320 xhairmw3 0 0 40 40
crosshair_3 320 xhairmw4 0 0 40 40
crosshair 640 xhairmw1 0 0 40 40
crosshair_1 640 xhairmw2 0 0 40 40
crosshair_2 640 xhairmw3 0 0 40 40
crosshair_3 640 xhairmw4 0 0 40 40
crosshair 800 xhairmw1 40 0 50 50
crosshair_1 800 xhairmw2 40 0 50 50
crosshair_2 800 xhairmw3 40 0 50 50
crosshair_3 800 xhairmw4 40 0 50 50
crosshair 1024 xhairmw1 90 0 64 64
crosshair_1 1024 xhairmw2 90 0 64 64
crosshair_2 1024 xhairmw3 90 0 64 64
crosshair_3 1024 xhairmw4 90 0 64 64
crosshair 1280 xhairmw1 154 0 80 80
crosshair_1 1280 xhairmw2 154 0 80 80
crosshair_2 1280 xhairmw3 154 0 80 80
crosshair_3 1280 xhairmw4 154 0 80 80
crosshair_1 320 xhairmw1 0 0 40 40
crosshair_2 320 xhairmw2 0 0 40 40
crosshair_3 320 xhairmw3 0 0 40 40
crosshair_4 320 xhairmw4 0 0 40 40
crosshair_1 640 xhairmw1 0 0 40 40
crosshair_2 640 xhairmw2 0 0 40 40
crosshair_3 640 xhairmw3 0 0 40 40
crosshair_4 640 xhairmw4 0 0 40 40
crosshair_1 800 xhairmw1 40 0 50 50
crosshair_2 800 xhairmw2 40 0 50 50
crosshair_3 800 xhairmw3 40 0 50 50
crosshair_4 800 xhairmw4 40 0 50 50
crosshair_1 1024 xhairmw1 90 0 64 64
crosshair_2 1024 xhairmw2 90 0 64 64
crosshair_3 1024 xhairmw3 90 0 64 64
crosshair_4 1024 xhairmw4 90 0 64 64
crosshair_1 1280 xhairmw1 154 0 80 80
crosshair_2 1280 xhairmw2 154 0 80 80
crosshair_3 1280 xhairmw3 154 0 80 80
crosshair_4 1280 xhairmw4 154 0 80 80

6
releases/3.2.0/sprites/weapon_parasite.txt
View file

@ -1,7 +1,7 @@
10
6
weapon 320 320w 80 80 80 20
weapon_s 320 320w-s 80 80 80 20
crosshair 320 xhairpara 0 0 128 128
crosshair_0 320 xhairpara 0 0 128 128
weapon 640 640aw3 0 0 170 45
weapon_s 640 640aw3-s 0 0 170 45
crosshair 640 xhairpara 0 0 128 128
crosshair_0 640 xhairpara 0 0 128 128

43
releases/3.2.0/sprites/weapon_pistol.txt
View file

@ -1,27 +1,28 @@
26
27
weapon 320 320w 160 60 80 20
weapon_s 320 320w-s 160 60 80 20
ammo 320 640hud7 24 72 24 24
weapon 640 640mw1 0 90 170 45
weapon_s 640 640mw1-s 0 90 170 45
ammo 640 640hud7 24 72 24 24
crosshair 320 xhairmw1 0 0 40 40
crosshair_1 320 xhairmw2 0 0 40 40
crosshair_2 320 xhairmw3 0 0 40 40
crosshair_3 320 xhairmw4 0 0 40 40
crosshair 640 xhairmw1 0 0 40 40
crosshair_1 640 xhairmw2 0 0 40 40
crosshair_2 640 xhairmw3 0 0 40 40
crosshair_3 640 xhairmw4 0 0 40 40
crosshair 800 xhairmw1 40 0 50 50
crosshair_1 800 xhairmw2 40 0 50 50
crosshair_2 800 xhairmw3 40 0 50 50
crosshair_3 800 xhairmw4 40 0 50 50
crosshair 1024 xhairmw1 90 0 64 64
crosshair_1 1024 xhairmw2 90 0 64 64
crosshair_2 1024 xhairmw3 90 0 64 64
crosshair_3 1024 xhairmw4 90 0 64 64
crosshair 1280 xhairmw1 154 0 80 80
crosshair_1 1280 xhairmw2 154 0 80 80
crosshair_2 1280 xhairmw3 154 0 80 80
crosshair_3 1280 xhairmw4 154 0 80 80
crosshair_0 320 xhairp 0 0 64 64
crosshair_1 320 xhairmw1 0 0 40 40
crosshair_2 320 xhairmw2 0 0 40 40
crosshair_3 320 xhairmw3 0 0 40 40
crosshair_4 320 xhairmw4 0 0 40 40
crosshair_1 640 xhairmw1 0 0 40 40
crosshair_2 640 xhairmw2 0 0 40 40
crosshair_3 640 xhairmw3 0 0 40 40
crosshair_4 640 xhairmw4 0 0 40 40
crosshair_1 800 xhairmw1 40 0 50 50
crosshair_2 800 xhairmw2 40 0 50 50
crosshair_3 800 xhairmw3 40 0 50 50
crosshair_4 800 xhairmw4 40 0 50 50
crosshair_1 1024 xhairmw1 90 0 64 64
crosshair_2 1024 xhairmw2 90 0 64 64
crosshair_3 1024 xhairmw3 90 0 64 64
crosshair_4 1024 xhairmw4 90 0 64 64
crosshair_1 1280 xhairmw1 154 0 80 80
crosshair_2 1280 xhairmw2 154 0 80 80
crosshair_3 1280 xhairmw3 154 0 80 80
crosshair_4 1280 xhairmw4 154 0 80 80

2
releases/3.2.0/sprites/weapon_primalscream.txt
View file

@ -1,4 +1,4 @@
10
6
weapon 320 320w 80 100 80 20
weapon_s 320 320w-s 80 100 80 20
ammo 320 320hud2 0 16 18 18

43
releases/3.2.0/sprites/weapon_shotgun.txt
View file

@ -1,27 +1,28 @@
26
27
weapon 320 320w 160 80 80 20
weapon_s 320 320w-s 160 80 80 20
ammo 320 640hud7 0 72 24 24
weapon 640 640mw2 0 135 170 45
weapon_s 640 640mw2-s 0 135 170 45
ammo 640 640hud7 0 72 24 24
crosshair 320 xhairmw1 0 80 40 40
crosshair_1 320 xhairmw2 0 80 40 40
crosshair_2 320 xhairmw3 0 80 40 40
crosshair_3 320 xhairmw4 0 80 40 40
crosshair 640 xhairmw1 0 80 40 40
crosshair_1 640 xhairmw2 0 80 40 40
crosshair_2 640 xhairmw3 0 80 40 40
crosshair_3 640 xhairmw4 0 80 40 40
crosshair 800 xhairmw1 40 80 50 50
crosshair_1 800 xhairmw2 40 80 50 50
crosshair_2 800 xhairmw3 40 80 50 50
crosshair_3 800 xhairmw4 40 80 50 50
crosshair 1024 xhairmw1 90 80 64 64
crosshair_1 1024 xhairmw2 90 80 64 64
crosshair_2 1024 xhairmw3 90 80 64 64
crosshair_3 1024 xhairmw4 90 80 64 64
crosshair 1280 xhairmw1 154 80 80 80
crosshair_1 1280 xhairmw2 154 80 80 80
crosshair_2 1280 xhairmw3 154 80 80 80
crosshair_3 1280 xhairmw4 154 80 80 80
crosshair_0 320 xhairsg 0 0 64 64
crosshair_1 320 xhairmw1 0 80 40 40
crosshair_2 320 xhairmw2 0 80 40 40
crosshair_3 320 xhairmw3 0 80 40 40
crosshair_4 320 xhairmw4 0 80 40 40
crosshair_1 640 xhairmw1 0 80 40 40
crosshair_2 640 xhairmw2 0 80 40 40
crosshair_3 640 xhairmw3 0 80 40 40
crosshair_4 640 xhairmw4 0 80 40 40
crosshair_1 800 xhairmw1 40 80 50 50
crosshair_2 800 xhairmw2 40 80 50 50
crosshair_3 800 xhairmw3 40 80 50 50
crosshair_4 800 xhairmw4 40 80 50 50
crosshair_1 1024 xhairmw1 90 80 64 64
crosshair_2 1024 xhairmw2 90 80 64 64
crosshair_3 1024 xhairmw3 90 80 64 64
crosshair_4 1024 xhairmw4 90 80 64 64
crosshair_1 1280 xhairmw1 154 80 80 80
crosshair_2 1280 xhairmw2 154 80 80 80
crosshair_3 1280 xhairmw3 154 80 80 80
crosshair_4 1280 xhairmw4 154 80 80 80

8
releases/3.2.0/sprites/weapon_spikegun.txt
View file

@ -1,11 +1,9 @@
10
8
weapon 320 320w 80 120 80 20
weapon_s 320 320w-s 80 120 80 20
ammo 320 320hud2 0 16 18 18
crosshair 320 xhairalien 0 0 128 128
autoaim 320 crosshairs 0 72 24 24
crosshair_0 320 xhairalien 0 0 128 128
weapon 640 640aw2 0 0 170 45
weapon_s 640 640aw2-s 0 0 170 45
ammo 640 640hud7 0 72 24 24
crosshair 640 xhairalien 0 0 128 128
autoaim 640 crosshairs 0 72 24 24
crosshair_0 640 xhairalien 0 0 128 128

6
releases/3.2.0/sprites/weapon_spit.txt
View file

@ -1,9 +1,9 @@
10
8
weapon 320 320w 0 160 80 20
weapon_s 320 320w-s 0 160 80 20
ammo 320 640hud7 96 96 24 24
crosshair 320 xhairspit 0 0 64 64
crosshair_0 320 xhairspit 0 0 64 64
weapon 640 640aw1 0 90 170 45
weapon_s 640 640aw1-s 0 90 170 45
ammo 640 640hud7 96 96 24 24
crosshair 640 xhairspit 0 0 64 64
crosshair_0 640 xhairspit 0 0 64 64

8
releases/3.2.0/sprites/weapon_spore.txt
View file

@ -1,11 +1,9 @@
10
8
weapon 320 320w 0 220 80 20
weapon_s 320 320w-s 0 220 80 20
ammo 320 640hud7 96 96 24 24
crosshair 320 xhairalien 0 0 128 128
autoaim 320 crosshairs 0 72 24 24
crosshair_0 320 xhairalien 0 0 128 128
weapon 640 640mw2 0 90 170 45
weapon_s 640 640mw2-s 0 90 170 45
ammo 640 640hud7 96 96 24 24
crosshair 640 xhairalien 0 0 128 128
autoaim 640 crosshairs 0 72 24 24
crosshair_0 640 xhairalien 0 0 128 128

2
releases/3.2.0/sprites/weapon_stomp.txt
View file

@ -1,4 +1,4 @@
8
6
weapon 320 320w 80 60 80 20
weapon_s 320 320w-s 80 60 80 20
ammo 320 640hud7 96 96 24 24

4
releases/3.2.0/sprites/weapon_umbra.txt
View file

@ -1,9 +1,9 @@
8
weapon 320 320w 80 20 80 20
weapon_s 320 320w-s 80 20 80 20
crosshair 320 xhairalien 0 0 128 128
crosshair_0 320 xhairalien 0 0 128 128
ammo 320 640hud7 96 96 24 24
weapon 640 640aw3 0 90 170 45
weapon_s 640 640aw3-s 0 90 170 45
ammo 640 640hud7 96 96 24 24
crosshair 640 xhairalien 0 0 128 128
crosshair_0 640 xhairalien 0 0 128 128

4
releases/3.2.0/sprites/weapon_webspinner.txt
View file

@ -2,8 +2,8 @@
weapon 320 320w 80 40 80 20
weapon_s 320 320w-s 80 40 80 20
ammo 320 640hud7 96 96 24 24
crosshair 320 xhairweb 0 0 64 64
crosshair_0 320 xhairweb 0 0 64 64
weapon 640 640aw2 0 45 170 45
weapon_s 640 640aw2-s 0 45 170 45
ammo 640 640hud7 96 96 24 24
crosshair 640 xhairweb 0 0 64 64
crosshair_0 640 xhairweb 0 0 64 64

40
releases/3.2.0/sprites/weapon_welder.txt
View file

@ -5,23 +5,23 @@ ammo 320 640hud7 0 72 24 24
weapon 640 640mw1 0 45 170 45
weapon_s 640 640mw1-s 0 45 170 45
ammo 640 640hud7 0 72 24 24
crosshair 320 xhairmw1 0 0 40 40
crosshair_1 320 xhairmw2 0 0 40 40
crosshair_2 320 xhairmw3 0 0 40 40
crosshair_3 320 xhairmw4 0 0 40 40
crosshair 640 xhairmw1 0 0 40 40
crosshair_1 640 xhairmw2 0 0 40 40
crosshair_2 640 xhairmw3 0 0 40 40
crosshair_3 640 xhairmw4 0 0 40 40
crosshair 800 xhairmw1 40 0 50 50
crosshair_1 800 xhairmw2 40 0 50 50
crosshair_2 800 xhairmw3 40 0 50 50
crosshair_3 800 xhairmw4 40 0 50 50
crosshair 1024 xhairmw1 90 0 64 64
crosshair_1 1024 xhairmw2 90 0 64 64
crosshair_2 1024 xhairmw3 90 0 64 64
crosshair_3 1024 xhairmw4 90 0 64 64
crosshair 1280 xhairmw1 154 0 80 80
crosshair_1 1280 xhairmw2 154 0 80 80
crosshair_2 1280 xhairmw3 154 0 80 80
crosshair_3 1280 xhairmw4 154 0 80 80
crosshair_1 320 xhairmw1 0 0 40 40
crosshair_2 320 xhairmw2 0 0 40 40
crosshair_3 320 xhairmw3 0 0 40 40
crosshair_4 320 xhairmw4 0 0 40 40
crosshair_1 640 xhairmw1 0 0 40 40
crosshair_2 640 xhairmw2 0 0 40 40
crosshair_3 640 xhairmw3 0 0 40 40
crosshair_4 640 xhairmw4 0 0 40 40
crosshair_1 800 xhairmw1 40 0 50 50
crosshair_2 800 xhairmw2 40 0 50 50
crosshair_3 800 xhairmw3 40 0 50 50
crosshair_4 800 xhairmw4 40 0 50 50
crosshair_1 1024 xhairmw1 90 0 64 64
crosshair_2 1024 xhairmw2 90 0 64 64
crosshair_3 1024 xhairmw3 90 0 64 64
crosshair_4 1024 xhairmw4 90 0 64 64
crosshair_1 1280 xhairmw1 154 0 80 80
crosshair_2 1280 xhairmw2 154 0 80 80
crosshair_3 1280 xhairmw3 154 0 80 80
crosshair_4 1280 xhairmw4 154 0 80 80