~armagetronad-dev/armagetronad/armagetronad-old-glancing

« back to all changes in this revision

Viewing changes to src/tron/gCycleMovement.cpp

Merge with 0.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
3147
3147
                        if( rear.type != gSENSOR_SELF && rear.type != gSENSOR_TEAMMATE )
3148
3148
                        {
3149
3149
                            REAL timing = rear.hit/(verletSpeed_ + 1E-10);
 
3150
 
 
3151
                            // extra factor: when the number of axes is not 4,
 
3152
                            // the effective speed at which the cycle would increase
 
3153
                            // the here detected distance is reduced. Thus, we
 
3154
                            // need to divide the timing by that speed factor.
 
3155
                            REAL factor = -lastDirDrive*dirDrive*d;
 
3156
                            if(factor > 0 && factor < 1)
 
3157
                                timing /= factor;
 
3158
 
3150
3159
                            player->AnalyzeTiming( timing );
3151
3160
                        }
3152
3161
                    }
3418
3427
                // and report
3419
3428
                // player->AnalyzeTiming( timing );
3420
3429
                */
 
3430
                uncannyTimingToReport_ = false;
3421
3431
            }
3422
3432
            else
3423
3433
            {