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/imlib/guistat.cpp

    r671 r682  
    5959    long h = wm->font()->Size().y;
    6060
    61     whom->stat_win->m_surf->Bar(vec2i(whom->stat_win->x1() + 1,
     61    whom->stat_win->m_surf->Bar(ivec2(whom->stat_win->x1() + 1,
    6262                                      whom->stat_win->y2() - h - 1),
    63                                 vec2i(whom->stat_win->x2() - 1,
     63                                ivec2(whom->stat_win->x2() - 1,
    6464                                      whom->stat_win->y2() - 1),
    6565                                wm->black());
    66     whom->stat_win->m_surf->Bar(vec2i(whom->stat_win->x1() + 2,
     66    whom->stat_win->m_surf->Bar(ivec2(whom->stat_win->x1() + 2,
    6767                                      whom->stat_win->y2() - h),
    68                                 vec2i(whom->stat_win->x2() - 2,
     68                                ivec2(whom->stat_win->x2() - 2,
    6969                                      whom->stat_win->y2() - 2),
    7070                                wm->dark_color());
    7171    if (perc)
    72         whom->stat_win->m_surf->Bar(vec2i(whom->stat_win->x1() + 3,
     72        whom->stat_win->m_surf->Bar(ivec2(whom->stat_win->x1() + 3,
    7373                                          whom->stat_win->y2() - h + 1),
    74                                     vec2i(whom->stat_win->x1() + l * perc / 100,
     74                                    ivec2(whom->stat_win->x1() + l * perc / 100,
    7575                                          whom->stat_win->y2() - 3),
    7676                                    wm->bright_color());
     
    113113    int mx = first->stat_win->x1() + 1;
    114114    int my = first->stat_win->y1() + wm->font()->Size().y / 2;
    115     first->stat_win=wm->CreateWindow(vec2i(wx, wy), vec2i(len3, h1*2+h2), NULL, "status");
    116     wm->font()->PutString(first->stat_win->m_surf, vec2i(mx, my), first->name, wm->black());
    117     wm->font()->PutString(first->stat_win->m_surf, vec2i(mx, my), first->name, wm->bright_color());
     115    first->stat_win=wm->CreateWindow(ivec2(wx, wy), ivec2(len3, h1*2+h2), NULL, "status");
     116    wm->font()->PutString(first->stat_win->m_surf, ivec2(mx, my), first->name, wm->black());
     117    wm->font()->PutString(first->stat_win->m_surf, ivec2(mx, my), first->name, wm->bright_color());
    118118    if (first->show)
    119119      first->show->draw(first->stat_win->m_surf, (first->stat_win->x2()-first->stat_win->x1())/2-
Note: See TracChangeset for help on using the changeset viewer.