kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkbox gui element

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1542 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-01-02 19:21:12 +00:00
parent e9a9896669
commit 472c0ef3a2
7 changed files with 250 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderparticles.cpp
+8 -3
View File
@@ -501,6 +501,7 @@ void particle_fireball(int type, vec &o)
}
VARP(holettl, 0, 10000, 30000);
VARP(bulletbouncesound, 0, 1, 1);
bool addbullethole(vec &from, vec &to, float radius)
{
@@ -514,7 +515,7 @@ bool addbullethole(vec &from, vec &to, float radius)
o.add(ray.mul(dist));
o.add(vec(surface).mul(0.005f));
newparticle(o, surface, holettl, 7);
playsound(S_BULLETBOUNCE, NULL, NULL, &o);
if(bulletbouncesound) playsound(S_BULLETBOUNCE, NULL, NULL, &o);
return true;
}
@@ -530,11 +531,12 @@ bool addscorchmark(vec &o, float radius)
}
VARP(shotlinettl, 0, 0, 10000);
VARP(bulletairsound, 0, 1, 1);
void addshotline(dynent *pl, vec &from, vec &to)
{
if(pl == player1) return;
bool fx = player1->isspectating() && shotlinettl > 0; // allow fx only in spect mode
bool fx = shotlinettl > 0 && (player1->isspectating() || !multiplayer(false)); // allow fx only in spect mode and locally
if(rnd(3) && !fx) return; // show all shotlines when fx enabled
int start = (camera1->o.dist(to) <= 10.0f) ? 8 : 5;
@@ -550,9 +552,12 @@ void addshotline(dynent *pl, vec &from, vec &to)
newparticle(o, d, fx ? shotlinettl : 75, 6);
// shotline sound fx
vec fromuv, touv, soundpos(unitv);
if(!bulletairsound) return;
vec fromuv, touv;
float fd = camera1->o.dist(from, fromuv);
float td = camera1->o.dist(to, touv);
if(fd < 8.0f || td < 8.0f) return; // ignore near shots
vec soundpos(unitv);
soundpos.mul(fd/(fd+td)*dist);
soundpos.add(from);
playsound(S_BULLETAIR, NULL, NULL, &soundpos);