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/loadgame.cpp

    r671 r682  
    8787    buts[i]->next=buts[i+1];
    8888
    89   return wm->CreateWindow(vec2i(mx, yres / 2 - (Jwindow::top_border() + maxih * 5) / 2), vec2i(-1), buts[0]);
     89  return wm->CreateWindow(ivec2(mx, yres / 2 - (Jwindow::top_border() + maxih * 5) / 2), ivec2(-1), buts[0]);
    9090}
    9191
     
    202202        if (fail && show_all)
    203203        {
    204             thumbnails[start_num] = new image(vec2i(160, 100));
     204            thumbnails[start_num] = new image(ivec2(160, 100));
    205205            thumbnails[start_num]->clear();
    206             console_font->PutString(thumbnails[start_num], vec2i(0), symbol_str("no_saved"));
     206            console_font->PutString(thumbnails[start_num], ivec2(0), symbol_str("no_saved"));
    207207            total_saved++;
    208208            if (!first) first=thumbnails[start_num];
     
    234234    // Create thumbnail window 5 pixels to the right of the list window
    235235    Jwindow *l_win=create_num_window(0,total_saved,MAX_SAVE_LINES,thumbnails);
    236     Jwindow *preview=wm->CreateWindow(l_win->m_pos + vec2i(l_win->m_size.x + 5, 0), vec2i(max_w, max_h), NULL, title);
    237 
    238     preview->m_surf->PutImage(first, vec2i(preview->x1(), preview->y1()));
     236    Jwindow *preview=wm->CreateWindow(l_win->m_pos + ivec2(l_win->m_size.x + 5, 0), ivec2(max_w, max_h), NULL, title);
     237
     238    preview->m_surf->PutImage(first, ivec2(preview->x1(), preview->y1()));
    239239
    240240    Event ev;
     
    252252            int draw_num=ev.message.id-ID_LOAD_GAME_PREVIEW;
    253253            preview->clear();
    254             preview->m_surf->PutImage(thumbnails[draw_num], vec2i(preview->x1(), preview->y1()));
     254            preview->m_surf->PutImage(thumbnails[draw_num], ivec2(preview->x1(), preview->y1()));
    255255        }
    256256
Note: See TracChangeset for help on using the changeset viewer.