Changeset 533 for abuse/trunk/src/game.cppTweet

Timestamp:

Apr 22, 2011, 7:32:13 PM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: rename trans_image to TImage. The code is now clean enough.

File:

• abuse/trunk/src/game.cpp (modified) (4 diffs)

abuse/trunk/src/game.cpp

@@ -564 +564 @@
 }
 
-void Game::put_block_fg(int x, int y, trans_image *im)
+void Game::put_block_fg(int x, int y, TImage *im)
 {
   for(view *f = first_view; f; f = f->next)
@@ -576 +576 @@
       screen->GetClip(cx1, cy1, cx2, cy2);
       screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1);
-      im->PutImage(screen, (x - xoff / ftile_width())*ftile_width()+viewx1 - xoff % ftile_width(),
-            (y - yoff / ftile_height())*ftile_height()+viewy1 - yoff % ftile_height());
+      im->PutImage(screen, vec2i((x - xoff / ftile_width())*ftile_width()+viewx1 - xoff % ftile_width(),
+            (y - yoff / ftile_height())*ftile_height()+viewy1 - yoff % ftile_height()));
       screen->SetClip(cx1, cy1, cx2, cy2);
     }
@@ -945 +945 @@
           if(fort_num != BLACK)
           {
-            get_fg(fort_num)->im->PutImage(screen, draw_x, draw_y);
+            get_fg(fort_num)->im->PutImage(screen, vec2i(draw_x, draw_y));
 
         if(!(dev & EDIT_MODE))
@@ -987 +987 @@
         {
           if(dev & DRAW_BG_LAYER)
-          get_fg(fort_num)->im->PutImage(screen, draw_x, draw_y);
+          get_fg(fort_num)->im->PutImage(screen, vec2i(draw_x, draw_y));
           else
-          get_fg(fort_num)->im->PutFilled(screen, draw_x, draw_y, 0);
+          get_fg(fort_num)->im->PutFilled(screen, vec2i(draw_x, draw_y), 0);
 
           if(!(dev & EDIT_MODE))