← Back to branch summary

~ubuntu-branches/ubuntu/trusty/teeworlds/trusty-updates

« back to all changes in this revision

Viewing changes to src/game/client/components/camera.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-08-05 15:02:49 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110805150249-1kai5j7v29m13dl3
Tags: 0.6.1+dfsg-1
* New upstream release.
* Repackage upstream tarball to remove pre-compiled libraries.
* Update watch file.
* Refresh patches.
* Drop patches that have been applied upstream: fix-ftbfs-hurd.patch,
  fix-ftbfs-kfreebsd.patch and gcc-endianness.patch.
* Use dh_link to create the DejaVuSans.ttf symlink.
* Query dpkg-buildflags instead of relying on dpkg-buildpackage to set the
  environment variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/game/client/components/camera.cpp
20
20
        //vec2 center;
21
21
        m_Zoom = 1.0f;
22
22
 
23
 
        // update camera center         
 
23
        // update camera center
24
24
        if(m_pClient->m_Snap.m_SpecInfo.m_Active && !m_pClient->m_Snap.m_SpecInfo.m_UsePosition)
25
25
        {
26
26
                if(m_CamType != CAMTYPE_SPEC)
50
50
 
51
51
                        CameraOffset = normalize(m_pClient->m_pControls->m_MousePos)*OffsetAmount;
52
52
                }
53
 
                
 
53
 
54
54
                if(m_pClient->m_Snap.m_SpecInfo.m_Active)
55
55
                        m_Center = m_pClient->m_Snap.m_SpecInfo.m_Position + CameraOffset;
56
56
                else