Changeset 512 for abuse/trunk/src/netcfg.cppTweet

Timestamp:

Apr 20, 2011, 12:39:27 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: use vec2i for image::size and unroll all necessary changes
everywhere else in the code.

File:

• abuse/trunk/src/netcfg.cpp (modified) (5 diffs)

abuse/trunk/src/netcfg.cpp

@@ -10 +10 @@
 
 #include "config.h"
+
+#include "common.h"
 
 #include "game.h"
@@ -262 +264 @@
 
   image *ns=cache.img(cache.reg("art/frame.spe","net_screen",SPEC_IMAGE,1));
-  int ns_w=ns->width(),ns_h=ns->height();
+  int ns_w=ns->Size().x,ns_h=ns->Size().y;
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
   ns->put_image(screen,x,y);
@@ -270 +272 @@
 
   uint8_t *sl=screen->scan_line(0);
-  int xx=screen->width()*screen->height();
+  int xx=screen->Size().x*screen->Size().y;
   for (; xx; xx--,sl++) *sl=remap[*sl];
 
@@ -327 +329 @@
 {
   image *ns=cache.img(cache.reg("art/frame.spe","net_screen",SPEC_IMAGE,1));
-  int ns_w=ns->width(),ns_h=ns->height();
+  int ns_w=ns->Size().x,ns_h=ns->Size().y;
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
   ns->put_image(screen,x,y);
@@ -446 +448 @@
 
   image *ns=cache.img(cache.reg("art/frame.spe","net_screen",SPEC_IMAGE,1));
-  int ns_w=ns->width(),ns_h=ns->height();
+  int ns_w=ns->Size().x,ns_h=ns->Size().y;
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
   ns->put_image(screen,x,y);