diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-20 23:00:46 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-20 23:00:46 +0000 |
| commit | ac1aeab149f704ab1b297be9c7662c5705e5e40d (patch) | |
| tree | 2c5fe9dcfe06c648ea2e1d8e87b638a76aeb1813 /src/game/server/entities/character.cpp | |
| parent | 9f7a6a04b0862737ca4566fb443140025505a522 (diff) | |
| download | zcatch-ac1aeab149f704ab1b297be9c7662c5705e5e40d.tar.gz zcatch-ac1aeab149f704ab1b297be9c7662c5705e5e40d.zip | |
fixed incorrect handling of projectiel and laser owner
Diffstat (limited to 'src/game/server/entities/character.cpp')
| -rw-r--r-- | src/game/server/entities/character.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 2efaf00f..8ad15284 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -322,7 +322,6 @@ void CHARACTER::fire_weapon() projectile_startpos, direction, (int)(server_tickspeed()*tuning.gun_lifetime), - this, 1, 0, 0, -1, WEAPON_GUN); // pack the projectile and send it to the client directly @@ -358,7 +357,6 @@ void CHARACTER::fire_weapon() projectile_startpos, vec2(cosf(a), sinf(a))*speed, (int)(server_tickspeed()*tuning.shotgun_lifetime), - this, 1, 0, 0, -1, WEAPON_SHOTGUN); // pack the projectile and send it to the client directly @@ -382,7 +380,6 @@ void CHARACTER::fire_weapon() projectile_startpos, direction, (int)(server_tickspeed()*tuning.grenade_lifetime), - this, 1, PROJECTILE::PROJECTILE_FLAGS_EXPLODE, 0, SOUND_GRENADE_EXPLODE, WEAPON_GRENADE); // pack the projectile and send it to the client directly @@ -401,7 +398,7 @@ void CHARACTER::fire_weapon() case WEAPON_RIFLE: { - new LASER(pos, direction, tuning.laser_reach, this); + new LASER(pos, direction, tuning.laser_reach, player->client_id); game.create_sound(pos, SOUND_RIFLE_FIRE); } break; |