From 30855c8ec80af5fa44702d793d12671b7eb46854 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sat, 10 Nov 2007 19:40:40 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1414 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/protos.h | 3 ++- source/src/weapon.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/src/protos.h b/source/src/protos.h index 38759d96..f9ee1f5f 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -451,4 +451,5 @@ struct demoheader { char magic[16]; int version, protocol; -}; \ No newline at end of file +}; + diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index d59afcdc..ed95bf9a 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -223,7 +223,7 @@ vector projs; void projreset() { projs.setsize(0); } -void newprojectile(vec &from, vec &to, float speed, bool local, playerent *owner, int gun) +void newprojectile(vec &from, vec &to, float speed, bool local, playerent *owner, int gun, int id = lastmillis) { projectile &p = projs.add(); p.o = from; @@ -232,7 +232,7 @@ void newprojectile(vec &from, vec &to, float speed, bool local, playerent *owner p.local = local; p.owner = owner; p.gun = gun; - p.id = lastmillis; + p.id = id; } void removeprojectiles(playerent *owner) @@ -556,7 +556,7 @@ void explode_nade(bounceent *i) if(!i) return; if(i->bouncestate != NADE_THROWED) thrownade(i->owner, vec(0,0,0), i); playsound(S_FEXPLODE, NULL, NULL, &i->o); - newprojectile(i->o, i->o, 1, i->owner==player1, i->owner, GUN_GRENADE); + newprojectile(i->o, i->o, 1, i->owner==player1, i->owner, GUN_GRENADE, i->millis); } void shootv(int gun, vec &from, vec &to, playerent *d, bool local, int nademillis) // create visual effect from a shot