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

no message

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@344 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-08-20 15:33:36 +00:00
parent 9382c6b9e7
commit 245e9d8e3d
10 changed files with 60 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+2 -4
View File
@@ -443,7 +443,6 @@ void throw_nade(dynent *d, vec &to, physent *p)
if(d==player1)
{
player1->lastaction = lastmillis;
conoutf("throw %i\n", lastmillis-p->millis);
addmsg(1, 9, SV_SHOT, d->gunselect, (int)(from.x*DMF), (int)(from.y*DMF), (int)(from.z*DMF), (int)(to.x*DMF), (int)(to.y*DMF), (int)(to.z*DMF), lastmillis-p->millis);
};
};
@@ -454,7 +453,6 @@ physent *new_nade(dynent *d, int millis = 0)
p->owner = d;
p->millis = lastmillis;
p->timetolife = 2000-millis;
conoutf("newnade %i", p->timetolife);
p->state = NADE_ACTIVATED;
d->inhandnade = p;
@@ -622,6 +620,7 @@ void shoot(dynent *d, vec &targ)
if(d->weaponchanging || attacktime<d->gunwait) return;
d->gunwait = 0;
d->reloading = false;
if(d->attacking && !d->inhandnade) // activate
{
@@ -631,7 +630,6 @@ void shoot(dynent *d, vec &targ)
d->gunwait = grenadepulltime;
d->lastaction = lastmillis;
d->lastattackgun = d->gunselect;
d->reloading = false;
}
else if(!d->attacking && d->inhandnade && attacktime>grenadepulltime) // throw
{
@@ -643,13 +641,13 @@ void shoot(dynent *d, vec &targ)
{
if(d->weaponchanging || attacktime<d->gunwait) return;
d->gunwait = 0;
d->reloading = false;
if(!d->attacking) { d->shots = 0; return; };
d->lastaction = lastmillis;
d->lastattackgun = d->gunselect;
if(!hasammo(d)) { d->shots = 0; return; };
d->reloading = false;
if(guns[d->gunselect].isauto) d->shots++;
else d->attacking = false;