From 33e5d9b5b3c551a365d36267cc18ae71873144c1 Mon Sep 17 00:00:00 2001 From: driAn Date: Wed, 26 Apr 2006 15:57:22 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@259 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 3 --- source/src/weapon.cpp | 10 ++++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 8a1a9951..9ac2f25d 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -234,7 +234,6 @@ void mphysents() { physent *p = physents[i]; if(p->state == NADE_THROWED) moveplayer(p, 2, false); -// printf("physent %i: %i %i %i\n", i, lastmillis, p->millis, p->timetolife); if(lastmillis - p->millis >= p->timetolife) { @@ -493,8 +492,6 @@ dynent *getclient(int cn) // ensure valid entity return players[cn] ? players[cn] : (players[cn] = newdynent()); }; -void addc() { strcpy(getclient(1)->team, "CT"); getclient(1)->o = player1->o; strcpy(getclient(1)->name, "sucker"); } COMMAND(addc, ARG_NONE); // FIXME - void initclient() { clientmap[0] = 0; diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index dcc7879b..bb2a9658 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -389,7 +389,7 @@ void explode_nade(physent *i) throw_nade(i->owner, o, i); }; playsound(S_FEXPLODE, &i->o); - newprojectile(i->o, i->o, 1, true, i->owner, GUN_GRENADE); + newprojectile(i->o, i->o, 1, i->owner==player1, i->owner, GUN_GRENADE); }; void shootv(int gun, vec &from, vec &to, dynent *d, bool local, int nademillis) // create visual effect from a shot @@ -415,16 +415,14 @@ void shootv(int gun, vec &from, vec &to, dynent *d, bool local, int nademillis) //particle_trail(1, 10, from, to); break; - case GUN_GRENADE: - //pspeed = guns[gun].projspeed; - //newprojectile(from, to, (float)pspeed, local, d, gun); - + case GUN_GRENADE: + { if(d!=player1) { physent *p = new_nade(d, nademillis); throw_nade(d, to, p); } - + } break; case GUN_SNIPER: