*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1414 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-11-10 19:40:40 +00:00
parent 3df88341c3
commit 30855c8ec8
2 changed files with 5 additions and 4 deletions
+2 -1
View File
@@ -451,4 +451,5 @@ struct demoheader
{
char magic[16];
int version, protocol;
};
};
+3 -3
View File
@@ -223,7 +223,7 @@ vector<projectile > 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