Ignore:
Timestamp:
Sep 12, 2011, 10:17:23 PM (11 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/netcfg.cpp

    r671 r682  
    5757void net_configuration::cfg_error(char const *msg)
    5858{
    59   Jwindow *j=wm->CreateWindow(vec2i(-1, 0), vec2i(-1), new info_field(0, 0, 0, msg,
     59  Jwindow *j=wm->CreateWindow(ivec2(-1, 0), ivec2(-1), new info_field(0, 0, 0, msg,
    6060      new button(0, 30,CFG_ERR_OK,symbol_str("ok_button"),NULL)),symbol_str("input_error"));
    6161  Event ev;
     
    268268  int ns_w=ns->Size().x,ns_h=ns->Size().y;
    269269  int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
    270   main_screen->PutImage(ns, vec2i(x, y));
     270  main_screen->PutImage(ns, ivec2(x, y));
    271271  JCFont *fnt=wm->font();
    272272
     
    280280      fy=y+ns_h/2-fnt->Size().y;
    281281
    282   fnt->PutString(main_screen, vec2i(fx + 1, fy + 1), message, wm->black());
    283   fnt->PutString(main_screen, vec2i(fx, fy), message, wm->bright_color());
     282  fnt->PutString(main_screen, ivec2(fx + 1, fy + 1), message, wm->black());
     283  fnt->PutString(main_screen, ivec2(fx, fy), message, wm->bright_color());
    284284
    285285
     
    308308  }
    309309
    310   main_screen->PutImage(screen_backup, vec2i(0, 0));
     310  main_screen->PutImage(screen_backup, ivec2(0, 0));
    311311  wm->flush_screen();
    312312  delete screen_backup;
     
    333333  int ns_w=ns->Size().x,ns_h=ns->Size().y;
    334334  int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
    335   main_screen->PutImage(ns, vec2i(x, y));
     335  main_screen->PutImage(ns, ivec2(x, y));
    336336  JCFont *fnt=wm->font();
    337337  image *ok_image=cache.img(cache.reg("art/frame.spe","dev_ok",SPEC_IMAGE,1))->copy(),
     
    452452  int ns_w=ns->Size().x,ns_h=ns->Size().y;
    453453  int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
    454   main_screen->PutImage(ns, vec2i(x, y));
     454  main_screen->PutImage(ns, ivec2(x, y));
    455455  char const *nw_s = symbol_str("Networking");
    456456  JCFont *fnt=wm->font();
    457457
    458458
    459   wm->font()->PutString(main_screen, vec2i(x + ns_w / 2 - strlen(nw_s) * fnt->Size().x / 2, y + 21 / 2 - fnt->Size().y / 2),
     459  wm->font()->PutString(main_screen, ivec2(x + ns_w / 2 - strlen(nw_s) * fnt->Size().x / 2, y + 21 / 2 - fnt->Size().y / 2),
    460460      nw_s,wm->medium_color());
    461461  {
Note: See TracChangeset for help on using the changeset viewer.