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

Added ammo type used in the weapon names.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1803 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-01-06 02:59:04 +00:00
parent 383135fcb1
commit 041e0b48da
2 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
quakec/fallout2/inventory.qc
View file

@ -744,42 +744,43 @@ string(float iid) GetItemName =
return "ripper"; return "ripper";
if (iid == IID_WP_POWERAXE) if (iid == IID_WP_POWERAXE)
return "poweraxe"; return "poweraxe";
if (iid == IID_WP_USP) if (iid == IID_WP_USP)
return "1911"; return "1911 (10mm)";
if (iid == IID_WP_DEAGLE) if (iid == IID_WP_DEAGLE)
return "desert eagle"; return "desert eagle (.44mag)";
if (iid == IID_WP_NEEDLER) if (iid == IID_WP_NEEDLER)
return "needler"; return "needler";
if (iid == IID_WP_ALIENBLASTER) if (iid == IID_WP_ALIENBLASTER)
return "alien blaster"; return "alien blaster (energy)";
if (iid == IID_WP_PIPERIFLE) if (iid == IID_WP_PIPERIFLE)
return "pipe rifle"; return "pipe rifle (10mm)";
if (iid == IID_WP_WINCHESTER) if (iid == IID_WP_WINCHESTER)
return "winchester"; return "winchester (12g)";
if (iid == IID_WP_MOSSBERG) if (iid == IID_WP_MOSSBERG)
return "mossberg"; return "mossberg (12g)";
if (iid == IID_WP_JACKHAMMER) if (iid == IID_WP_JACKHAMMER)
return "jackhammer"; return "jackhammer (12g)";
if (iid == IID_WP_MP9) if (iid == IID_WP_MP9)
return "mp9"; return "mp9 (10mm)";
if (iid == IID_WP_MP7) if (iid == IID_WP_MP7)
return "grease gun"; return "grease gun (10mm)";
if (iid == IID_WP_RANGEMASTER) if (iid == IID_WP_RANGEMASTER)
return "rangemaster"; return "rangemaster (5.56mm)";
if (iid == IID_WP_AK112) if (iid == IID_WP_AK112)
return "ak-112"; return "ak-112 (5mm-hv)";
if (iid == IID_WP_AK74) if (iid == IID_WP_AK74)
return "ak-74"; return "ak-74 (5mm-hv)";
if (iid == IID_WP_DKS1) if (iid == IID_WP_DKS1)
return "dks-1"; return "dks-1 (7.62mm)";
if (iid == IID_WP_MOONLIGHT) if (iid == IID_WP_MOONLIGHT)
return "moonlight"; return "moonlight (5.56mm)";
if (iid == IID_WP_SA80) if (iid == IID_WP_SA80)
return "sa-80"; return "sa-80 (5.56mm)";
if (iid == IID_WP_GAUSERIFLE) if (iid == IID_WP_GAUSERIFLE)
return "gauss rifle"; return "gauss rifle (2mm EC)";
if (iid == IID_WP_PULSERIFLE) if (iid == IID_WP_PULSERIFLE)
return "laser carbine"; return "laser carbine (energy)";

7
quakec/fallout2/weapons.qc
View file

@ -1087,13 +1087,8 @@ void() W_Attack =
else if (weap == IID_WP_MP9) else if (weap == IID_WP_MP9)
FireSMG(12, 2, "weapons/mp7.wav", 2000, 0.06); FireSMG(12, 2, "weapons/mp7.wav", 2000, 0.06);
else if (weap == IID_WP_MP7) else if (weap == IID_WP_MP7)
<<<<<<< weapons.qc FireSMG(12, 2, "weapons/mp7.wav", 2000, 0.06);
FireSMG(12, 2, "weapons/mp7.wav", 2000, 0.1);
else if (weap == IID_WP_RANGEMASTER) else if (weap == IID_WP_RANGEMASTER)
=======
FireSMG(12, 2, "weapons/mp5.wav", 2000, 0.06);
else if (weap == IID_WP_RANGERMASTER)
>>>>>>> 1.16
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/rangem.wav", 4000, 0.1);