← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/game/client/render.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-05-05 09:49:34 UTC
  • mfrom: (1.2.5)
  • Revision ID: package-import@ubuntu.com-20130505094934-uidw42ov1t0jlvrz
Tags: 0.6.2+dfsg-1
* New upstream release.
  - Update patches.
* Pass $CPPFLAGS to the build system.
* Switch to my @debian.org email address.
* Bump Standards-Version to 3.9.4, no changes needed.
* Change Vcs host to anonscm.debian.org.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/game/client/render.cpp
75
75
 
76
76
void CRenderTools::SelectSprite(int Id, int Flags, int sx, int sy)
77
77
{
78
 
        if(Id < 0 || Id > g_pData->m_NumSprites)
 
78
        if(Id < 0 || Id >= g_pData->m_NumSprites)
79
79
                return;
80
80
        SelectSprite(&g_pData->m_aSprites[Id], Flags, sx, sy);
81
81
}
314
314
                                CTile *pTiles = (CTile *)pLayers->Map()->GetData(pTmap->m_Data);
315
315
                                for(int y = 0; y < pTmap->m_Height; y++)
316
316
                                {
317
 
                                        for(int x = 1; x < pTmap->m_Width; x++)
 
317
                                        for(int x = 1; x < pTmap->m_Width;)
318
318
                                        {
319
319
                                                int sx;
320
320
                                                for(sx = 1; x+sx < pTmap->m_Width && sx < 255; sx++)
324
324
                                                }
325
325
 
326
326
                                                pTiles[y*pTmap->m_Width+x].m_Skip = sx-1;
 
327
                                                x += sx;
327
328
                                        }
328
329
                                }
329
330
                        }