summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxolatile2025-07-21 01:42:12 +0200
committerxolatile2025-07-21 01:42:12 +0200
commit39de2c68c8a3f9cd7cffef9364a59c9d412b907e (patch)
tree45c70b5f510d5b5cb8885876848081efa70fd1ff /src
parentdf493b99e8a33ee196b96761074e9f36bd344054 (diff)
downloadxolatile-badassbug-39de2c68c8a3f9cd7cffef9364a59c9d412b907e.tar.xz
xolatile-badassbug-39de2c68c8a3f9cd7cffef9364a59c9d412b907e.tar.zst
Auto, custom map menu, weapon effects...
Diffstat (limited to 'src')
-rw-r--r--src/fpsgame/weapon.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/fpsgame/weapon.cpp b/src/fpsgame/weapon.cpp
index b062609..ab87ebf 100644
--- a/src/fpsgame/weapon.cpp
+++ b/src/fpsgame/weapon.cpp
@@ -576,6 +576,8 @@ namespace game
{
case GUN_FIST:
if(d->type==ENT_PLAYER && chainsawhudgun) sound = S_CHAINSAW_ATTACK;
+ //~if(d->quadmillis)
+ //~particle_splash(PART_FLAME, 60, 300, vec(0).sub(from), 0x802010, 0.24f);
break;
case GUN_SG:
@@ -585,6 +587,8 @@ namespace game
particle_flare(d->muzzle, d->muzzle, 200, PART_MUZZLE_FLASH3, 0xFFFFFF, 2.75f, d);
loopi(guns[gun].rays)
{
+ if(d->quadmillis)
+ particle_trail(PART_FLAME, 400, hudgunorigin(gun, from, rays[i], d), rays[i], 0x802010, 0.6f, 36);
particle_splash(PART_SPARK, 20, 250, rays[i], 0xB49B4B, 0.24f);
particle_flare(hudgunorigin(gun, from, rays[i], d), rays[i], 300, PART_STREAK, 0xFFC864, 0.28f);
if(!local) adddecal(DECAL_BULLET, rays[i], vec(from).sub(rays[i]).safenormalize(), 2.0f);
@@ -597,6 +601,8 @@ namespace game
case GUN_PISTOL:
{
particle_splash(PART_SPARK, 200, 250, to, 0xB49B4B, 0.24f);
+ if(d->quadmillis)
+ particle_trail(PART_FLAME, 400, hudgunorigin(gun, from, to, d), to, 0x802010, 0.6f, 36);
particle_flare(hudgunorigin(gun, from, to, d), to, 600, PART_STREAK, 0xFFC864, 0.28f);
if(muzzleflash && d->muzzle.x >= 0)
particle_flare(d->muzzle, d->muzzle, gun==GUN_CG ? 100 : 200, PART_MUZZLE_FLASH1, 0xFFFFFF, gun==GUN_CG ? 2.25f : 1.25f, d);
@@ -606,6 +612,8 @@ namespace game
}
case GUN_RL:
+ if(d->quadmillis)
+ particle_trail(PART_FLAME, 400, hudgunorigin(gun, from, to, d), to, 0x802010, 0.6f, 36);
if(muzzleflash && d->muzzle.x >= 0)
particle_flare(d->muzzle, d->muzzle, 250, PART_MUZZLE_FLASH2, 0xFFFFFF, 3.0f, d);
pspeed = guns[gun].projspeed;
@@ -626,7 +634,9 @@ namespace game
case GUN_RIFLE:
particle_splash(PART_SPARK, 200, 250, to, 0xB49B4B, 0.24f);
- particle_trail(PART_SMOKE, 500, hudgunorigin(gun, from, to, d), to, 0x404040, 0.6f, 20);
+ if(d->quadmillis)
+ particle_trail(PART_FLAME, 400, hudgunorigin(gun, from, to, d), to, 0x802010, 0.6f, 36);
+ particle_trail(PART_SMOKE, 500, hudgunorigin(gun, from, to, d), to, 0x404040, 0.6f, 18);
if(muzzleflash && d->muzzle.x >= 0)
particle_flare(d->muzzle, d->muzzle, 150, PART_MUZZLE_FLASH3, 0xFFFFFF, 1.25f, d);
if(!local) adddecal(DECAL_BULLET, to, vec(from).sub(to).safenormalize(), 3.0f);