← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty-proposed

« back to all changes in this revision

Viewing changes to src/nullopenglgraphics.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-07-11 10:09:41 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20130711100941-f0rwuvcwgl8ulqo8
Tags: 1.3.7.7.1-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nullopenglgraphics.cpp
553
553
 
554
554
        for (iv = intVertPool.begin(), ft = floatTexPool.begin(),
555
555
             ivp = vp.begin();
556
 
             iv != iv_end, ft != ft_end,
557
 
             ivp != ivp_end;
 
556
             iv != iv_end && ft != ft_end && ivp != ivp_end;
558
557
             ++ iv, ++ ft, ++ ivp)
559
558
        {
560
559
            drawQuadArrayfi(*iv, *ft, *ivp);
568
567
 
569
568
        for (iv = intVertPool.begin(), it = intTexPool.begin(),
570
569
             ivp = vp.begin();
571
 
             iv != iv_end, it != it_end,
572
 
             ivp != ivp_end;
 
570
             iv != iv_end && it != it_end && ivp != ivp_end;
573
571
             ++ iv, ++ it, ++ ivp)
574
572
        {
575
573
            drawQuadArrayii(*iv, *it, *ivp);
989
987
    restoreColor();
990
988
}
991
989
 
992
 
void NullOpenGLGraphics::drawLine(int x1 A_UNUSED, int y1 A_UNUSED,
993
 
                                  int x2 A_UNUSED, int y2 A_UNUSED)
 
990
void NullOpenGLGraphics::drawLine(int x1, int y1,
 
991
                                  int x2, int y2)
994
992
{
995
993
    setTexturingAndBlending(false);
996
994
    restoreColor();