Ignore:
Timestamp:
May 16, 2011, 2:37:19 AM (11 years ago)
Author:
Sam Hocevar
Message:

imlib: make JCFont use vec2i classes.

File:
1 edited

Legend:

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

    r656 r668  
    10351035        strcat(msg," <<");
    10361036
    1037       fnt->put_string(main_screen,x,y,msg,color);
    1038       y+=fnt->height();
     1037      fnt->PutString(main_screen, vec2i(x, y), msg, color);
     1038      y += fnt->Size().y;
    10391039    }
    10401040  }
     
    10591059  for (v=player_list; v; v=v->next) tp++;
    10601060
    1061   int y=(y1+y2)/2-(tp+2)*fnt->height()/2,x=x1+10;
     1061  int y=(y1+y2)/2-(tp+2)*fnt->Size().y/2,x=x1+10;
    10621062  char const *header_str = symbol_str("score_header");
    1063   fnt->put_string(main_screen,x,y,header_str,wm->bright_color());
    1064   y+=fnt->height();
     1063  fnt->PutString(main_screen, vec2i(x, y), header_str, wm->bright_color());
     1064  y += fnt->Size().y;
    10651065
    10661066  main_screen->WidgetBar(vec2i(x, y + 2),
    1067                          vec2i(x + strlen(header_str) * fnt->width(),
    1068                                y + fnt->height() - 3),
     1067                         vec2i(x + strlen(header_str) * fnt->Size().x,
     1068                               y + fnt->Size().y - 3),
    10691069                         wm->bright_color(), wm->medium_color(),
    10701070                         wm->dark_color());
    1071   y+=fnt->height();
    1072   v=player_list;
     1071  y += fnt->Size().y;
     1072  v = player_list;
    10731073  for (i=0; i<tp; i++)
    10741074  {
     
    10821082
    10831083    sprintf(msg,"%-17s %3ld  %3ld",max_name,(long)v->kills,(long)(v->tkills+v->kills));
    1084     fnt->put_string(main_screen,x,y,msg,color);
    1085 
    1086     y+=fnt->height();
    1087     v=v->next;
     1084    fnt->PutString(main_screen, vec2i(x, y), msg, color);
     1085
     1086    y += fnt->Size().y;
     1087    v = v->next;
    10881088  }
    10891089
Note: See TracChangeset for help on using the changeset viewer.