eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

*** empty log message ***

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1812 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Magnus 2006-01-07 00:57:14 +00:00
parent 0c2186f0d9
commit 0887be0383
3 changed files with 43 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
quakec/fallout2/player.qc
View file

@ -88,18 +88,17 @@ void () player_stand1 = [ 149, player_stand1 ]
return; return;
} }
} }
if ((self.velocity_x || self.velocity_y)) if (self.velocity_x || self.velocity_y)
{ {
self.walkframe = MULTICAST_ALL; self.walkframe = 0;
player_run (); player_run ();
return; return;
} }
if ((self.walkframe >= MULTICAST_PVS_R)) if (self.walkframe >= 5)
{ self.walkframe = 0;
self.walkframe = MULTICAST_ALL;
} self.frame = 149 + self.walkframe;
self.frame = (149 + self.walkframe); self.walkframe = self.walkframe + 1;
self.walkframe = (self.walkframe + WEAPON_SHOTGUN);
}; };
void () player_crouch = [ 45, player_run ] void () player_crouch = [ 45, player_run ]

50
quakec/fallout2/weapons.qc
View file

@ -1054,9 +1054,12 @@ void() W_Attack =
if (self.rtime > time) if (self.rtime > time)
return; return;
if (self.attack_finished > time)
return;
if (W_CheckNoAmmo()) if (W_CheckNoAmmo())
return; return;
weap = ToIID(self.(SlotField(self.current_slot))); weap = ToIID(self.(SlotField(self.current_slot)));
@ -1092,15 +1095,16 @@ void() W_Attack =
else if (weap == IID_WP_RANGEMASTER) else if (weap == IID_WP_RANGEMASTER)
FireAssaultRifle(14, 2, "weapons/rangem.wav", 4000, 0.5); FireAssaultRifle(14, 2, "weapons/rangem.wav", 4000, 0.5);
else if (weap == IID_WP_AK112) else if (weap == IID_WP_AK112)
FireAssaultRifle(14, 2, "weapons/rangem.wav", 4000, 0.1); FireAssaultRifle(14, 2, "weapons/ak112.wav", 4000, 0.09);
else if (weap == IID_WP_AK74) else if (weap == IID_WP_AK74)
FireAssaultRifle(18, 2, "weapons/ak47.wav", 6000, 0.1); FireAssaultRifle(18, 2, "weapons/ak47.wav", 6000, 0.1);
else if (weap == IID_WP_DKS1) else if (weap == IID_WP_DKS1)
FireAssaultRifle(30, 2, "weapons/dks-1.wav", 8000, 0.5); FireAssaultRifle(30, 2, "weapons/dks-1.wav", 8000, 0.5);
else if (weap == IID_WP_MOONLIGHT) else if (weap == IID_WP_MOONLIGHT)
FireAssaultRifle(16, 2, "weapons/m4-nw.wav", 4000, 0.1); FireAssaultRifle(16, 2, "weapons/m4-nw.wav", 4000, 0.09);
else if (weap == IID_WP_SA80)
FireAssaultRifle(17, 2, "weapons/sa80.wav", 4000, 0.08);
//float IID_WP_SA80 = 420;
//float IID_WP_GAUSERIFLE = 421; //float IID_WP_GAUSERIFLE = 421;
//float IID_WP_PULSERIFLE = 422; //float IID_WP_PULSERIFLE = 422;
@ -1247,6 +1251,15 @@ void() CycleWeaponCommand =
void () ProneOff = void () ProneOff =
{ {
setsize(self, '-16 -16 -24', '16 16 32');
if (!walkmove(0, 0))
{
sprint (self, 2, "not enough room to stand up.\n");
setsize(self, '-16 -16 -24', '16 16 0');
return;
}
sprint (self, 2, "position: stand.\n"); sprint (self, 2, "position: stand.\n");
self.position = 0; self.position = 0;
PositionControl(); PositionControl();
@ -1274,7 +1287,16 @@ void () ProneOn =
void () DuckOff = void () DuckOff =
{ {
setsize(self, '-16 -16 -24', '16 16 32');
if (!walkmove(0, 0))
{
sprint (self, 2, "not enough room to stand up.\n");
setsize(self, '-16 -16 -24', '16 16 16');
return;
}
sprint (self, 2, "position: stand.\n"); sprint (self, 2, "position: stand.\n");
self.view_ofs = '0 0 22';
self.position = 0; self.position = 0;
PositionControl(); PositionControl();
player_run (); player_run ();
@ -1451,6 +1473,13 @@ void() W_WeaponFrame =
SuperDamageSound (); SuperDamageSound ();
W_Attack (); W_Attack ();
} }
if (!self.button0)
{
if (self.attack > 0)
player_run ();
self.attack = 0;
}
}; };
/* /*
@ -1502,7 +1531,7 @@ void () autofire =
if (self.weaponframe == 1) if (self.weaponframe == 1)
self.weaponframe = 2; self.weaponframe = 2;
else if (self.weaponframe == 2) else
self.weaponframe = 1; self.weaponframe = 1;
muzzleflash (); muzzleflash ();
@ -1517,7 +1546,7 @@ void () autofire_s =
if (self.weaponframe == 1) if (self.weaponframe == 1)
self.weaponframe = 2; self.weaponframe = 2;
else if (self.weaponframe == 2) else
self.weaponframe = 1; self.weaponframe = 1;
muzzleflash (); muzzleflash ();
@ -2178,15 +2207,6 @@ void (float dam, float rec, string snd, float rng, float rate) FireAssaultRifle
self.attack_finished = (time + rate); self.attack_finished = (time + rate);
if (self.attack == 0 && self.position == POS_STAND)
player_single1 ();
if (self.attack == 0 && self.position >= POS_DUCK)
player_single1_s ();
if (self.attack >= 1 && self.position == POS_STAND)
autofire ();
if (self.attack >= 1 && self.position >= POS_DUCK)
autofire_s ();
if (self.position == 0) if (self.position == 0)
adjust = '0 0 0'; adjust = '0 0 0';
if (self.position == 1) if (self.position == 1)
@ -2199,7 +2219,7 @@ void (float dam, float rec, string snd, float rng, float rate) FireAssaultRifle
if (self.recoil >= 15) if (self.recoil >= 15)
self.recoil = 15; self.recoil = 15;
if (self.attack >= 1) if (self.attack == 0)
{ {
if (self.position == 0) if (self.position == 0)
player_single1 (); player_single1 ();

2
quakec/fallout2/world.qc
View file

@ -435,7 +435,7 @@ void() worldspawn =
precache_model ("maps/b_bh100.bsp"); precache_model ("maps/b_bh100.bsp");
precache_model ("progs/s_light.spr"); precache_model ("progs/s_light.spr");
precache_sound ("misc/thud.wav");
precache_sound ("player/step1.wav"); precache_sound ("player/step1.wav");
precache_sound ("player/step2.wav"); precache_sound ("player/step2.wav");
precache_sound ("player/step3.wav"); precache_sound ("player/step3.wav");