← Back to branch summary

~ubuntu-branches/ubuntu/natty/alien-arena/natty

« back to all changes in this revision

Viewing changes to source/game/g_trigger.c

  • Committer: Bazaar Package Importer
  • Author(s): Andres Mejia, Barry deFreese, Ansgar Burchardt, Gonéri Le Bouder, Andres Mejia
  • Date: 2008-04-18 17:43:24 UTC
  • mfrom: (1.1.2 upstream) (3.1.1 hardy)
  • Revision ID: james.westby@ubuntu.com-20080418174324-si1umi8dngglaha4
Tags: 7.0-1
http://bugs.debian.org/453555
http://bugs.debian.org/457700
[ Barry deFreese ]
* Escape - in alien-arena-server.6.
* Add myself to uploaders.

[ Ansgar Burchardt ]
* Remove deprecated Encoding key from .desktop file.

[ Gonéri Le Bouder ]
* Remove Homepage from package description.

[ Andres Mejia ]
* New upstream release.
* Removing XS- part for Vcs-* lines.
* Removing +ssh part of Vcs-Svn line.
* Bumped to Standards-Version 3.7.3.
* Test for existence of *-stamp stamps before removing them.
* Removed Encoding field in desktop file.
* Modify patch for upstream Makefile to make Makefile more useful in building
  Debian packages.
  + Also fixes problem not detecting the existence of libcurl.
* Remove debug packages for release. Will support nostrip option instead.
* Add description for fix-CVE-2007-4754-CVE-2007-4755.dpatch, silences
  lintian warning.
* Add new link for watchfile.
  + Closes: #453555
* Moved debian/scripts/alien-arena-tarball.sh to
  debian/alien-arena-get-orig-source.
* Modified alien-arena-data-get-orig-source to make it easier to maintain.
* Switched from dpatch to quilt.
* Cut down package description.
* Closing bug about mouse constantly looking up. The submitter could not
  reproduce the bug after deleting the ~/.alien-arena directory.
  + Closes: #457700
* Updated copyright file for new release.
* Updated README.Debian files.
* Adding new images for icons. Need build dependency on sharutils.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/game/g_trigger.c
81
81
                if (!(self->spawnflags & 1))
82
82
                        return;
83
83
        }
 
84
        
84
85
        else
85
86
                return;
86
87
 
523
524
 
524
525
void trigger_monsterjump_touch (edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf)
525
526
{
 
527
 
 
528
        if (self->nextthink)
 
529
                return;         // already been triggered
 
530
 
526
531
        if (other->flags & (FL_FLY | FL_SWIM) )
527
532
                return;
528
533
        if (other->svflags & SVF_DEADMONSTER)
532
537
        other->velocity[0] = self->movedir[0] * self->speed;
533
538
        other->velocity[1] = self->movedir[1] * self->speed;
534
539
        
535
 
//      if (!other->groundentity)
536
 
//              return;
537
 
        
538
540
        other->groundentity = NULL;
539
541
        other->velocity[2] = self->movedir[2];
 
542
 
 
543
        //play a sound
 
544
        gi.sound (other, CHAN_AUTO, gi.soundindex("world/button2.wav"), 1, ATTN_NORM, 0);
 
545
        self->nextthink = level.time + .1;
540
546
}
541
547
 
542
548
void SP_trigger_monsterjump (edict_t *self)
550
556
        InitTrigger (self);
551
557
        self->touch = trigger_monsterjump_touch;
552
558
        self->movedir[2] = st.height;
 
559
        self->think = multi_wait;
553
560
}
554
561
 
555
562
//trigger_deathballtarget - a "goal" used for scoring in deathball