vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Fixed wrong price for the M3 etc.

Browse source
This commit is contained in:
Marco Cawthorne 2016-12-02 01:02:24 +01:00
parent 77e5325762
commit 2a04b63a88
3 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Source/Shared/WeaponM3.c
View file

@ -30,7 +30,7 @@ int iWeaponMode_M3;
weaponinfo_t wptM3 = {
WEAPON_M3, // Identifier
SLOT_PRIMARY,
500, // Price
1700, // Price
CALIBER_BUCKSHOT, // Caliber ID
220, // Max Player Speed
9, // Bullets Per Shot
@ -40,7 +40,7 @@ weaponinfo_t wptM3 = {
3000, // Bullet Range
0.7, // Range Modifier
TYPE_SEMI,
1.0, // Attack-Delay
1.0, // Attack-Delay
3.0, // Reload-Delay
iAmmo_BUCKSHOT, // Caliber Pointer
iClip_M3 // Clip Pointer
@ -66,8 +66,18 @@ void WeaponM3_Draw( void ) {
#endif
}
void WeaponM3_ReloadNULL( void ) { }
void WeaponM3_PrimaryFire( void ) {
#ifdef QWSSQC
if ( self.iMode_M3 == TRUE ) {
self.iMode_M3 = 0;
Client_SendEvent( self, EV_WEAPON_RELOAD );
self.think = WeaponM3_ReloadNULL;
self.fAttackFinished = time + 1.0;
return;
}
if ( OpenCSGunBase_PrimaryFire() == TRUE ) {
sound( self, CHAN_WEAPON, "weapons/m3-1.wav", 1, ATTN_NORM );
}
@ -87,6 +97,7 @@ void WeaponM3_Secondary( void ) {
if ( (self.(wptM3.iClipfld) == wptM3.iClipSize) || ( self.(wptM3.iCaliberfld) <= 0 ) ) {
self.iMode_M3 = 0;
Client_SendEvent( self, EV_WEAPON_RELOAD );
self.think = WeaponM3_ReloadNULL;
self.fAttackFinished = time + 1.0;
return;
}
@ -105,7 +116,6 @@ void WeaponM3_Secondary( void ) {
void WeaponM3_Reload( void ) {
#ifdef QWSSQC
static void WeaponM3_ReloadNULL( void ) { }
// Can we reload the gun even if we wanted to?
if ( ( self.(wptM3.iClipfld) != wptM3.iClipSize ) && ( self.(wptM3.iCaliberfld) > 0 ) ) {
self.iMode_M3 = 1 - self.iMode_M3;

16
Source/Shared/WeaponXM1014.c
View file

@ -66,8 +66,18 @@ void WeaponXM1014_Draw( void ) {
#endif
}
void WeaponXM1014_ReloadNULL( void ) { }
void WeaponXM1014_PrimaryFire( void ) {
#ifdef QWSSQC
if ( self.iMode_XM1014 == TRUE ) {
self.iMode_XM1014 = 0;
Client_SendEvent( self, EV_WEAPON_RELOAD );
self.think = WeaponXM1014_ReloadNULL;
self.fAttackFinished = time + 0.5;
return;
}
if ( OpenCSGunBase_PrimaryFire() == TRUE ) {
sound( self, CHAN_WEAPON, "weapons/xm1014-1.wav", 1, ATTN_NORM );
}
@ -87,7 +97,8 @@ void WeaponXM1014_Secondary( void ) {
if ( (self.(wptXM1014.iClipfld) == wptXM1014.iClipSize) || ( self.(wptXM1014.iCaliberfld) <= 0 ) ) {
self.iMode_XM1014 = 0;
Client_SendEvent( self, EV_WEAPON_RELOAD );
self.fAttackFinished = time + 1.0;
self.think = WeaponXM1014_ReloadNULL;
self.fAttackFinished = time + 0.5;
return;
}
@ -105,7 +116,6 @@ void WeaponXM1014_Secondary( void ) {
void WeaponXM1014_Reload( void ) {
#ifdef QWSSQC
static void WeaponXM1014_ReloadNULL( void ) { }
// Can we reload the gun even if we wanted to?
if ( ( self.(wptXM1014.iClipfld) != wptXM1014.iClipSize ) && ( self.(wptXM1014.iCaliberfld) > 0 ) ) {
self.iMode_XM1014 = 1 - self.iMode_XM1014;
@ -118,7 +128,7 @@ void WeaponXM1014_Reload( void ) {
}
Client_SendEvent( self, EV_WEAPON_RELOAD );
self.fAttackFinished = time + 1.0;
self.fAttackFinished = time + 0.5;
}
#else
iWeaponMode_XM1014 = 1 - iWeaponMode_XM1014;

4
Source/Shared/Weapons.c
View file

@ -54,6 +54,10 @@ weaponfunc_t wpnFuncTable[ CS_WEAPON_COUNT ] = {
void Weapon_Draw( float fWeapon ) {
wpnFuncTable[ fWeapon ].vDraw();
#ifdef QWSSQC
self.maxspeed = (float)wptTable[ fWeapon ].iPlayerSpeed;
#endif
}
void Weapon_PrimaryAttack( float fWeapon ) {