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

    r676 r682  
    830830    if (o->controller() && o->controller()->local_player())
    831831      main_screen->PutImage(cache.img(S_health_image),
    832                             vec2i(o->controller()->m_bb.x - 20,
     832                            ivec2(o->controller()->m_bb.x - 20,
    833833                                  o->controller()->m_aa.y + 5), 1);
    834834      } break;
     
    852852    if (o->controller() && o->controller()->local_player())
    853853      main_screen->PutImage(cache.img(S_fast_image),
    854                             vec2i(o->controller()->m_bb.x - 20,
     854                            ivec2(o->controller()->m_bb.x - 20,
    855855                                  o->controller()->m_aa.y + 5), 1);
    856856      } break;
     
    874874    if (o->controller() && o->controller()->local_player())
    875875      main_screen->PutImage(cache.img(S_fly_image),
    876                             vec2i(o->controller()->m_bb.x - 20,
     876                            ivec2(o->controller()->m_bb.x - 20,
    877877                                  o->controller()->m_aa.y + 5), 1);
    878878      } break;
     
    888888    if (o->controller() && o->controller()->local_player())
    889889      main_screen->PutImage(cache.img(S_sneaky_image),
    890                             vec2i(o->controller()->m_bb.x - 20,
     890                            ivec2(o->controller()->m_bb.x - 20,
    891891                                  o->controller()->m_aa.y + 5), 1);
    892892      } break;
     
    10231023    qsort(sorted_players,tp,sizeof(view *),compare_players);
    10241024
    1025     vec2i pos = local->m_aa;
     1025    ivec2 pos = local->m_aa;
    10261026    char msg[100];
    10271027
     
    10481048{
    10491049  fade_out(8);
    1050   wm->SetMousePos(vec2i(0, 0));
     1050  wm->SetMousePos(ivec2(0, 0));
    10511051  main_screen->clear();
    10521052  image *im=cache.img(cache.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));
    1053   main_screen->PutImage(im, vec2i(0, 0));
     1053  main_screen->PutImage(im, ivec2(0, 0));
    10541054  int x1=im->Size().x+1,y1=0,y2=main_screen->Size().y;
    10551055  JCFont *fnt=wm->font();
     
    10601060  int y=(y1+y2)/2-(tp+2)*fnt->Size().y/2,x=x1+10;
    10611061  char const *header_str = symbol_str("score_header");
    1062   fnt->PutString(main_screen, vec2i(x, y), header_str, wm->bright_color());
     1062  fnt->PutString(main_screen, ivec2(x, y), header_str, wm->bright_color());
    10631063  y += fnt->Size().y;
    10641064
    1065   main_screen->WidgetBar(vec2i(x, y + 2),
    1066                          vec2i(x + strlen(header_str) * fnt->Size().x,
     1065  main_screen->WidgetBar(ivec2(x, y + 2),
     1066                         ivec2(x + strlen(header_str) * fnt->Size().x,
    10671067                               y + fnt->Size().y - 3),
    10681068                         wm->bright_color(), wm->medium_color(),
     
    10811081
    10821082    sprintf(msg,"%-17s %3ld  %3ld",max_name,(long)v->kills,(long)(v->tkills+v->kills));
    1083     fnt->PutString(main_screen, vec2i(x, y), msg, color);
     1083    fnt->PutString(main_screen, ivec2(x, y), msg, color);
    10841084
    10851085    y += fnt->Size().y;
Note: See TracChangeset for help on using the changeset viewer.