~ubuntu-branches/ubuntu/precise/openarena/precise

Viewing changes to game/code/game/g_combat.c

Committer: Bazaar Package Importer
Author(s): Simon McVittie
Date: 2010-10-11 19:40:30 UTC
Revision ID: james.westby@ubuntu.com-20101011194030-m7275x8abqsepc99

Tags: 0.8.5-5

http://bugs.debian.org/599866

Add patch (already upstream as oax r239) to fix a crash if a non-client
object is damaged by a non-player source, e.g. setting off the Kamikaze
near a powerup (Closes: #599866)

files added:
.pc/0042-G_Damage-check-before-dereferencing-targ-client-whic.patch

.pc/0042-G_Damage-check-before-dereferencing-targ-client-whic.patch/game

.pc/0042-G_Damage-check-before-dereferencing-targ-client-whic.patch/game/code

.pc/0042-G_Damage-check-before-dereferencing-targ-client-whic.patch/game/code/game

.pc/0042-G_Damage-check-before-dereferencing-targ-client-whic.patch/game/code/game/g_combat.c

debian/patches/0042-G_Damage-check-before-dereferencing-targ-client-whic.patch

files modified:
.pc/applied-patches

debian/changelog

debian/patches/series

game/code/game/g_combat.c

Show diffs side-by-side

added added

removed removed

game/code/game/g_combat.c

1043

1044

//Sago: See if the client was sent flying

1045

//Check if damage is by somebody who is not a player!

1046

if( (!attacker || attacker->s.eType != ET_PLAYER) && client->lastSentFlying>-1 && ( mod==MOD_FALLING || mod==MOD_LAVA || mod==MOD_SLIME || mod==MOD_TRIGGER_HURT || mod==MOD_SUICIDE) ) {

1046

if( (!attacker || attacker->s.eType != ET_PLAYER) && client && client->lastSentFlying>-1 && ( mod==MOD_FALLING || mod==MOD_LAVA || mod==MOD_SLIME || mod==MOD_TRIGGER_HURT || mod==MOD_SUICIDE) ) {

1047

if( client->lastSentFlyingTime+5000<level.time) {

1048

client->lastSentFlying = -1; //More than 5 seconds, not a kill!

1049

} else {

Older »