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

Timestamp:

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

Author:

Sam Hocevar

Message:

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

File:

• abuse/trunk/src/objects.cpp (modified) (8 diffs)

abuse/trunk/src/objects.cpp

@@ -396 +396 @@
     sy1 = Max(v->cy1, sy1);
     sy2 = Min(v->cy2, sy2);
-    trans_image *p=picture();
+    TImage *p=picture();
 
     for (i=sy1; i<=sy2; i++)
-      p->PutScanLine(screen,sx,i,0);
+      p->PutScanLine(screen,vec2i(sx,i),0);
   }
 }
@@ -680 +680 @@
 void game_object::draw_trans(int count, int max)
 {
-  trans_image *cpict=picture();
+  TImage *cpict=picture();
   cpict->PutFade(screen,
-          (direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
-          y-cpict->Size().y+1-current_vyadd,
+          vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
+                y-cpict->Size().y+1-current_vyadd),
           count,max,
           color_table,the_game->current_palette());
@@ -691 +691 @@
 void game_object::draw_tint(int tint_id)
 {
-  trans_image *cpict=picture();
+  TImage *cpict=picture();
   if (fade_count())
     cpict->PutFadeTint(screen,
-               (direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
-               y-cpict->Size().y+1-current_vyadd,
+               vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
+                     y-cpict->Size().y+1-current_vyadd),
                fade_count(),fade_max(),
                cache.ctint(tint_id)->data,
@@ -703 +703 @@
   else
     cpict->PutRemap(screen,
-               (direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
-               y-cpict->Size().y+1-current_vyadd,
+               vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
+                     y-cpict->Size().y+1-current_vyadd),
                cache.ctint(tint_id)->data);
 }
@@ -711 +711 @@
 void game_object::draw_double_tint(int tint_id, int tint2)
 {
-  trans_image *cpict=picture();
+  TImage *cpict=picture();
   if (fade_count())
     cpict->PutFadeTint(screen,
-               (direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
-               y-cpict->Size().y+1-current_vyadd,
+               vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
+                     y-cpict->Size().y+1-current_vyadd),
                fade_count(),fade_max(),
                cache.ctint(tint_id)->data,
@@ -723 +723 @@
   else
     cpict->PutDoubleRemap(screen,
-               (direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
-               y-cpict->Size().y+1-current_vyadd,
+               vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
+                     y-cpict->Size().y+1-current_vyadd),
                cache.ctint(tint_id)->data,
                cache.ctint(tint2)->data);
@@ -733 +733 @@
 void game_object::draw_predator()
 {
-  trans_image *cpict=picture();
+  TImage *cpict=picture();
   cpict->PutPredator(screen,
-             (direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
-             y-cpict->Size().y+1-current_vyadd);
+             vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
+                   y-cpict->Size().y+1-current_vyadd));
 
 }
@@ -756 +756 @@
     else
     {
-      trans_image *cpict=picture();
+      TImage *cpict=picture();
       cpict->PutImage(screen,
-               (direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
-               y-cpict->Size().y+1-current_vyadd);
+               vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
+                     y-cpict->Size().y+1-current_vyadd));
     }
   }