← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/qcommon/pmove.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/qcommon/pmove.c
684
684
// see if standing on something solid   
685
685
        point[0] = pml.origin[0];
686
686
        point[1] = pml.origin[1];
687
 
        point[2] = pml.origin[2] - 0.25;
 
687
        point[2] = pml.origin[2] - 0.15; //Irritant - changed from 0.25 - this seems to fix the issue
 
688
                                                                         //in which sometimes while strafejumping it seemed the jump
 
689
                                                                         //was getting "lost"
688
690
        if (pml.velocity[2] > 180) //!!ZOID changed from 100 to 180 (ramp accel)
689
691
        {
690
692
                pm->s.pm_flags &= ~PMF_ON_GROUND;
784
786
        if(sv_joustmode->value)
785
787
                jousting = true;
786
788
 
787
 
        if (pm->s.pm_flags & PMF_TIME_LAND)
788
 
        {       // hasn't been long enough since landing to jump again
789
 
                return;
790
 
        }
 
789
//      if (pm->s.pm_flags & PMF_TIME_LAND)
 
790
//      {       // hasn't been long enough since landing to jump again
 
791
//              return;
 
792
//      }
791
793
 
792
794
        if (pm->cmd.upmove < 10)
793
795
        {       // not holding jump
1265
1267
        memset (&pml, 0, sizeof(pml));
1266
1268
 
1267
1269
        // convert origin and velocity to float values
1268
 
        pml.origin[0] = pm->s.origin[0]*0.125;
1269
 
        pml.origin[1] = pm->s.origin[1]*0.125;
1270
 
        pml.origin[2] = pm->s.origin[2]*0.125;
 
1270
        pml.origin[0] = pm->s.origin[0]*0.125f;
 
1271
        pml.origin[1] = pm->s.origin[1]*0.125f;
 
1272
        pml.origin[2] = pm->s.origin[2]*0.125f;
1271
1273
 
1272
 
        pml.velocity[0] = pm->s.velocity[0]*0.125;
1273
 
        pml.velocity[1] = pm->s.velocity[1]*0.125;
1274
 
        pml.velocity[2] = pm->s.velocity[2]*0.125;
 
1274
        pml.velocity[0] = pm->s.velocity[0]*0.125f;
 
1275
        pml.velocity[1] = pm->s.velocity[1]*0.125f;
 
1276
        pml.velocity[2] = pm->s.velocity[2]*0.125f;
1275
1277
 
1276
1278
        // save old org in case we get stuck
1277
1279
        VectorCopy (pm->s.origin, pml.previous_origin);
1278
1280
 
1279
 
        pml.frametime = pm->cmd.msec * 0.001;
 
1281
        pml.frametime = pm->cmd.msec * 0.001f;
1280
1282
 
1281
1283
        PM_ClampAngles ();
1282
1284