Ignore:
Timestamp:
Sep 12, 2011, 10:17:23 PM (8 years ago)
Author:
Sam Hocevar
Message:

core: rename vec2i to ivec2 and update matrix.h from Lol Engine.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/objects.cpp

    r674 r682  
    381381  picture_space(x1,y1,x2,y2);
    382382
    383   vec2i pos1 = the_game->GameToMouse(vec2i(x1, y1), v);
     383  ivec2 pos1 = the_game->GameToMouse(ivec2(x1, y1), v);
    384384  if (pos1.y >= v->m_aa.y)
    385385  {
     
    387387    current_level->foreground_intersect(x, y1, tmp, draw_to);
    388388    // calculate pos2.y
    389     vec2i pos2 = the_game->GameToMouse(vec2i(x1, draw_to), v);
     389    ivec2 pos2 = the_game->GameToMouse(ivec2(x1, draw_to), v);
    390390
    391391    pos2.y = Max(v->m_aa.y, pos2.y);
     
    394394
    395395    for (int i = pos2.y; i <= pos1.y; i++)
    396       p->PutScanLine(main_screen, vec2i(pos1.x, i), 0);
     396      p->PutScanLine(main_screen, ivec2(pos1.x, i), 0);
    397397  }
    398398}
     
    671671  TransImage *cpict=picture();
    672672  cpict->PutFade(main_screen,
    673           vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
     673          ivec2((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
    674674                y-cpict->Size().y+1-current_vyadd),
    675675          count,max,
     
    683683  if (fade_count())
    684684    cpict->PutFadeTint(main_screen,
    685                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
     685               ivec2((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
    686686                     y-cpict->Size().y+1-current_vyadd),
    687687               fade_count(),fade_max(),
     
    692692  else
    693693    cpict->PutRemap(main_screen,
    694                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
     694               ivec2((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
    695695                     y-cpict->Size().y+1-current_vyadd),
    696696               cache.ctint(tint_id)->data);
     
    703703  if (fade_count())
    704704    cpict->PutFadeTint(main_screen,
    705                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
     705               ivec2((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
    706706                     y-cpict->Size().y+1-current_vyadd),
    707707               fade_count(),fade_max(),
     
    712712  else
    713713    cpict->PutDoubleRemap(main_screen,
    714                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
     714               ivec2((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
    715715                     y-cpict->Size().y+1-current_vyadd),
    716716               cache.ctint(tint_id)->data,
     
    724724  TransImage *cpict=picture();
    725725  cpict->PutPredator(main_screen,
    726              vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
     726             ivec2((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
    727727                   y-cpict->Size().y+1-current_vyadd));
    728728
     
    747747      TransImage *cpict=picture();
    748748      cpict->PutImage(main_screen,
    749                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
     749               ivec2((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
    750750                     y-cpict->Size().y+1-current_vyadd));
    751751    }
Note: See TracChangeset for help on using the changeset viewer.