~swag/armagetronad/0.2.9-sty+ct+ap-fork

« back to all changes in this revision

Viewing changes to src/engine/eCamera.cpp

  • Committer: bazaarmagetron
  • Date: 2009-09-10 22:23:35 UTC
  • mto: (563.27.1 armagetronad)
  • mto: This revision was merged to the branch mainline in revision 688.
  • Revision ID: svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Fbranches%2F0.2.8%2Farmagetronad:9256
Automatic merging of commits that would change history order:
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1664
1664
    if (!CenterAlive() && (mode==CAMERA_IN || mode==CAMERA_SMART_IN)){// || mode==CAMERA_CUSTOM || mode==CAMERA_SERVER_CUSTOM)){
1665
1665
        pos=pos-dir.Turn(eCoord(5,1));
1666
1666
        z+=2;
1667
 
        mode=CAMERA_SMART;
 
1667
        mode = localPlayer ? localPlayer->startCamera : CAMERA_SMART;
1668
1668
    }
1669
1669
 
1670
1670
    const REAL dirSmooth = se_cameraSmartCenterDirSmooth;