r5935 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Feb 23 10:38:30 EST 2009
Author: div0
Date: 2009-02-23 10:38:30 -0500 (Mon, 23 Feb 2009)
New Revision: 5935
Modified:
trunk/data/qcsrc/server/w_campingrifle.qc
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_hagar.qc
trunk/data/qcsrc/server/w_hook.qc
trunk/data/qcsrc/server/w_laser.qc
trunk/data/qcsrc/server/w_seeker.qc
trunk/data/qcsrc/server/w_shotgun.qc
trunk/data/qcsrc/server/w_uzi.qc
Log:
WFRAME_FIRE2
Modified: trunk/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- trunk/data/qcsrc/server/w_campingrifle.qc 2009-02-23 15:28:00 UTC (rev 5934)
+++ trunk/data/qcsrc/server/w_campingrifle.qc 2009-02-23 15:38:30 UTC (rev 5935)
@@ -129,7 +129,7 @@
if (weapon_prepareattack(1, cvar("g_balance_campingrifle_secondary_refire")))
{
W_Campingrifle_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_campingrifle_secondary_animtime"), W_Campingrifle_CheckReloadAndReady);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_campingrifle_secondary_animtime"), W_Campingrifle_CheckReloadAndReady);
}
}
}
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2009-02-23 15:28:00 UTC (rev 5934)
+++ trunk/data/qcsrc/server/w_electro.qc 2009-02-23 15:38:30 UTC (rev 5935)
@@ -192,7 +192,7 @@
if (weapon_prepareattack(1, cvar("g_balance_electro_secondary_refire")))
{
W_Electro_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_secondary_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_electro_secondary_animtime"), w_ready);
}
}
else if (req == WR_PRECACHE)
Modified: trunk/data/qcsrc/server/w_hagar.qc
===================================================================
--- trunk/data/qcsrc/server/w_hagar.qc 2009-02-23 15:28:00 UTC (rev 5934)
+++ trunk/data/qcsrc/server/w_hagar.qc 2009-02-23 15:38:30 UTC (rev 5935)
@@ -149,7 +149,7 @@
if (weapon_prepareattack(1, cvar("g_balance_hagar_secondary_refire")))
{
W_Hagar_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hagar_secondary_refire"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_hagar_secondary_refire"), w_ready);
}
}
else if (req == WR_PRECACHE)
Modified: trunk/data/qcsrc/server/w_hook.qc
===================================================================
--- trunk/data/qcsrc/server/w_hook.qc 2009-02-23 15:28:00 UTC (rev 5934)
+++ trunk/data/qcsrc/server/w_hook.qc 2009-02-23 15:38:30 UTC (rev 5935)
@@ -130,7 +130,7 @@
if (weapon_prepareattack(1, cvar("g_balance_hook_secondary_refire")))
{
W_Hook_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hook_secondary_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_hook_secondary_animtime"), w_ready);
}
}
Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc 2009-02-23 15:28:00 UTC (rev 5934)
+++ trunk/data/qcsrc/server/w_laser.qc 2009-02-23 15:38:30 UTC (rev 5935)
@@ -96,7 +96,7 @@
if (weapon_prepareattack(0, cvar("g_balance_laser_secondary_refire")))
{
W_Laser_Attack(TRUE);
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_secondary_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_laser_secondary_animtime"), w_ready);
}
}
else
Modified: trunk/data/qcsrc/server/w_seeker.qc
===================================================================
--- trunk/data/qcsrc/server/w_seeker.qc 2009-02-23 15:28:00 UTC (rev 5934)
+++ trunk/data/qcsrc/server/w_seeker.qc 2009-02-23 15:38:30 UTC (rev 5935)
@@ -438,7 +438,7 @@
if (weapon_prepareattack(1, cvar("g_balance_seeker_flac_refire")))
{
Seeker_Fire_Flac();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_seeker_flac_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_seeker_flac_animtime"), w_ready);
}
}
Modified: trunk/data/qcsrc/server/w_shotgun.qc
===================================================================
--- trunk/data/qcsrc/server/w_shotgun.qc 2009-02-23 15:28:00 UTC (rev 5934)
+++ trunk/data/qcsrc/server/w_shotgun.qc 2009-02-23 15:38:30 UTC (rev 5935)
@@ -94,12 +94,12 @@
void shotgun_fire2_03()
{
W_Shotgun_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), w_ready);
}
void shotgun_fire2_02()
{
W_Shotgun_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_03);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_03);
}
void spawnfunc_weapon_shotgun(); // defined in t_items.qc
@@ -123,7 +123,7 @@
if (weapon_prepareattack(1, cvar("g_balance_shotgun_secondary_refire")))
{
W_Shotgun_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_02);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_02);
}
}
else if (req == WR_PRECACHE)
Modified: trunk/data/qcsrc/server/w_uzi.qc
===================================================================
--- trunk/data/qcsrc/server/w_uzi.qc 2009-02-23 15:28:00 UTC (rev 5934)
+++ trunk/data/qcsrc/server/w_uzi.qc 2009-02-23 15:38:30 UTC (rev 5935)
@@ -109,18 +109,18 @@
else if (req == WR_THINK)
{
if (self.BUTTON_ATCK)
- if (weapon_prepareattack(0, cvar("g_balance_uzi_refire")))
+ if (weapon_prepareattack(0, 0))
{
self.uzi_bulletcounter = 1;
- W_Uzi_Attack(WEP_UZI);
+ W_Uzi_Attack(WEP_UZI); // sets attack_finished
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_uzi_sustained_refire"), uzi_fire1_02);
}
if (self.BUTTON_ATCK2)
- if (weapon_prepareattack(1, cvar("g_balance_uzi_refire")))
+ if (weapon_prepareattack(1, 0))
{
self.uzi_bulletcounter = 1;
- W_Uzi_Attack(WEP_UZI | HITTYPE_SECONDARY);
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_uzi_sustained_refire"), w_ready);
+ W_Uzi_Attack(WEP_UZI | HITTYPE_SECONDARY); // sets attack_finished
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_uzi_first_refire"), w_ready);
}
}
else if (req == WR_PRECACHE)
More information about the nexuiz-commits
mailing list