Changeset 533Tweet

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.

Location:

abuse/trunk/src

Files:

• cache.h (modified) (1 diff)
• dev.cpp (modified) (1 diff)
• devsel.cpp (modified) (2 diffs)
• endgame.cpp (modified) (2 diffs)
• game.cpp (modified) (4 diffs)
• game.h (modified) (1 diff)
• go.cpp (modified) (1 diff)
• imlib/fonts.cpp (modified) (2 diffs)
• imlib/fonts.h (modified) (1 diff)
• imlib/supmorph.cpp (modified) (2 diffs)
• imlib/supmorph.h (modified) (1 diff)
• imlib/timage.cpp (modified) (13 diffs)
• imlib/timage.h (modified) (2 diffs)
• items.cpp (modified) (2 diffs)
• items.h (modified) (2 diffs)
• morpher.cpp (modified) (1 diff)
• objects.cpp (modified) (8 diffs)
• objects.h (modified) (1 diff)
• seq.h (modified) (1 diff)

abuse/trunk/src/cache.h

@@ -62 +62 @@
  *  - sound
  *  - image
- *  - trans_image
+ *  - TImage
  */
 

abuse/trunk/src/dev.cpp

@@ -3007 +3007 @@
     {
       im->clear();
-      the_game->get_fg(pat[i])->im->PutImage(im,0,0);
+      the_game->get_fg(pat[i])->im->PutImage(im,vec2i(0,0));
       scale_put(im,me->screen,me->x1()+(i%w)*tw,
         me->y1()+(i/w)*th,tw,th);

abuse/trunk/src/devsel.cpp

@@ -112 +112 @@
         {
           im.clear();
-          the_game->get_fg(i)->im->PutImage(&im,0,0);
+          the_game->get_fg(i)->im->PutImage(&im,vec2i(0,0));
 
           if (rev)
@@ -131 +131 @@
       case SPEC_CHARACTER :
       {
-        figures[i]->get_sequence(stopped)->get_figure(0)->forward->PutImage(&im,0,0);
+        figures[i]->get_sequence(stopped)->get_figure(0)->forward->PutImage(&im,vec2i(0,0));
         scale_put(&im,screen,xo,yo,xw,ya);
       } break;

abuse/trunk/src/endgame.cpp

@@ -237 +237 @@
       {
     cache.img(planet)->put_image(tcopy,0,0);
-    cache.fig(explo_frames1[i-30])->forward->PutImage(tcopy,100,50);
+    cache.fig(explo_frames1[i-30])->forward->PutImage(tcopy,vec2i(100,50));
         scan_map(screen,ex,ey,tcopy,
            cache.img(planet2),
@@ -320 +320 @@
       last=c;
       if (c->char_num)
-        cache.fig(explo_frames2[c->frame])->forward->PutImage(screen,c->x,c->y);
+        cache.fig(explo_frames2[c->frame])->forward->PutImage(screen,vec2i(c->x,c->y));
 
       c->x-=3;

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))

abuse/trunk/src/game.h

@@ -128 +128 @@
   void draw_map(view *v, int interpolate=0);
   void dev_scroll();
-  void put_block_fg(int x, int y, trans_image *im);
+  void put_block_fg(int x, int y, TImage *im);
   void put_block_bg(int x, int y, image *im);
 

abuse/trunk/src/go.cpp

@@ -104 +104 @@
     sy1=max(the_game->viewy1,sy1);
     sy2=min(the_game->viewy2,sy2);
-    trans_image *p=picture();
+    TImage *p=picture();
 
     for (i=sy1; i<=sy2; i++)

abuse/trunk/src/imlib/fonts.cpp

@@ -55 +55 @@
   {
     if (color>=0)
-      let[(int)ch]->PutColor(screen,x,y,color);
-    else let[(int)ch]->PutImage(screen,x,y);
+      let[(int)ch]->PutColor(screen,vec2i(x,y),color);
+    else let[(int)ch]->PutImage(screen,vec2i(x,y));
   }
 }
@@ -74 +74 @@
     letters->put_part(&tmp,0,0,((int)ch%32)*tl,((int)ch/32)*th,
               ((int)ch%32)*tl+tl-1,((int)ch/32)*th+th-1,1);
-    let[ch]=new trans_image(&tmp,"JCfont");
+    let[ch]=new TImage(&tmp,"JCfont");
   }
 }

abuse/trunk/src/imlib/fonts.h

@@ -35 +35 @@
 {
   int tl,th;
-  trans_image *let[256];
+  TImage *let[256];
 public:
   JCFont(image *letters);

abuse/trunk/src/imlib/supmorph.cpp

@@ -25 +25 @@
                              ((int)(y1)-(int)y2)*((int)(y1)-(int)y2))
 
-super_morph::super_morph(trans_image *hint1, trans_image *hint2,
+super_morph::super_morph(TImage *hint1, TImage *hint2,
              int aneal_steps, void (*stat_fun)(int))
 {
@@ -356 +356 @@
   int steps=atoi(argv[1]);
   if (steps<2) steps=50;
-  trans_image *hh1=new trans_image(h1,"hint1"),*hh2=new trans_image(h2,"hint2");
+  TImage *hh1=new TImage(h1,"hint1"),*hh2=new TImage(h2,"hint2");
 
   time_marker time1;

abuse/trunk/src/imlib/supmorph.h

@@ -20 +20 @@
   unsigned char *movers;
   int w,h;
-  super_morph(trans_image *h1, trans_image *h2, int aneal_steps, void (*stat_fun)(int));
+  super_morph(TImage *h1, TImage *h2, int aneal_steps, void (*stat_fun)(int));
   ~super_morph() { if (t) free(movers); }
 } ;

abuse/trunk/src/imlib/timage.cpp

@@ -11 +11 @@
 #include "config.h"
 
+#include <cstdio>
+#include <cstring>
+
 #include "common.h"
 
 #include "timage.h"
 
-trans_image::trans_image(image *im, char const *name)
+TImage::TImage(image *im, char const *name)
 {
     m_size = im->Size();
@@ -50 +53 @@
     if (!parser)
     {
-        printf("size = %d %d (%d bytes)\n",im->Size().x,im->Size().y,bytes);
-        CONDITION(parser, "malloc error for trans_image::m_data");
+        printf("size = %d %d (%d bytes)\n", m_size.x, m_size.y, bytes);
+        CONDITION(parser, "malloc error for TImage::m_data");
     }
 
@@ -88 +91 @@
 }
 
-trans_image::~trans_image()
+TImage::~TImage()
 {
     free(m_data);
 }
 
-image *trans_image::ToImage()
+image *TImage::ToImage()
 {
     image *im = new image(m_size);
@@ -102 +105 @@
     im->Unlock();
 
-    PutImage(im, 0, 0);
+    PutImage(im, vec2i(0));
     return im;
 }
 
-uint8_t *trans_image::ClipToLine(image *screen, int x1, int y1, int x2, int y2,
-                                 int x, int &y, int &ysteps)
+uint8_t *TImage::ClipToLine(image *screen, vec2i pos1, vec2i pos2,
+                            vec2i &pos, int &ysteps)
 {
     // check to see if it is totally clipped out first
-    if (y + m_size.y <= y1 || y >= y2 || x >= x2 || x + m_size.x <= x1)
+    if (pos.y + m_size.y <= pos1.y || pos.y >= pos2.y
+         || pos.x >= pos2.x || pos.x + m_size.x <= pos1.x)
         return NULL;
 
     uint8_t *parser = m_data;
 
-    int skiplines = Max(y1 - y, 0); // number of lines to skip
-    ysteps = Min(y2 - y, m_size.y - skiplines); // number of lines to draw
-    y += skiplines; // first line to draw
+    // Number of lines to skip, number of lines to draw, first line to draw
+    int skiplines = Max(pos1.y - pos.y, 0);
+    ysteps = Min(pos2.y - pos.y, m_size.y - skiplines);
+    pos.y += skiplines;
 
     while (skiplines--)
@@ -133 +138 @@
     }
 
-    screen->AddDirty(Max(x, x1), y, Min(x + m_size.x, x2), y + m_size.y);
+    screen->AddDirty(Max(pos.x, pos1.x), pos.y,
+                     Min(pos.x + m_size.x, pos2.x), pos.y + m_size.y);
     return parser;
 }
 
 template<int N>
-void trans_image::PutImageGeneric(image *screen, int x, int y, uint8_t color,
-                                  image *blend, int bx, int by,
-                                  uint8_t *remap, uint8_t *remap2,
-                                  int amount, int total_frames,
-                                  uint8_t *tint, color_filter *f, palette *pal)
-{
-    int x1, y1, x2, y2;
+void TImage::PutImageGeneric(image *screen, vec2i pos, uint8_t color,
+                             image *blend, vec2i bpos, uint8_t *map,
+                             uint8_t *map2, int amount, int total_frames,
+                             uint8_t *tint, color_filter *f, palette *pal)
+{
+    vec2i pos1, pos2;
     int ysteps, mul = 0;
 
-    screen->GetClip(x1, y1, x2, y2);
+    screen->GetClip(pos1.x, pos1.y, pos2.x, pos2.y);
 
     if (N == SCANLINE)
     {
-        y1 = Max(y1, y + amount);
-        y2 = Min(y2, y + amount + 1);
-        if (y1 >= y2)
+        pos1.y = Max(pos1.y, pos.y + amount);
+        pos2.y = Min(pos2.y, pos.y + amount + 1);
+        if (pos1.y >= pos2.y)
             return;
     }
 
-    uint8_t *datap = ClipToLine(screen, x1, y1, x2, y2, x, y, ysteps),
+    uint8_t *datap = ClipToLine(screen, pos1, pos2, pos, ysteps),
             *screen_line, *blend_line = NULL, *paddr = NULL;
     if (!datap)
         return; // if ClipToLine says nothing to draw, return
 
-    CONDITION(N == BLEND && y >= by && y + ysteps < by + blend->Size().y + 1,
-              "Blend doesn't fit on trans_image");
+    CONDITION(N == BLEND && pos.y >= bpos.y
+                         && pos.y + ysteps < bpos.y + blend->Size().y + 1,
+              "Blend doesn't fit on TImage");
 
     if (N == FADE || N == FADE_TINT || N == BLEND)
@@ -174 +180 @@
 
     if (N == PREDATOR)
-        ysteps = Min(ysteps, y2 - 1 - y - 2);
+        ysteps = Min(ysteps, pos2.y - 1 - pos.y - 2);
 
     screen->Lock();
 
-    screen_line = screen->scan_line(y) + x;
+    screen_line = screen->scan_line(pos.y) + pos.x;
     int sw = screen->Size().x;
-    x1 -= x; x2 -= x;
-
-    for (; ysteps > 0; ysteps--, y++)
+    pos1.x -= pos.x; pos2.x -= pos.x;
+
+    for (; ysteps > 0; ysteps--, pos.y++)
     {
         if (N == BLEND)
-            blend_line = blend->scan_line(y - by);
+            blend_line = blend->scan_line(pos.y - bpos.y);
 
         for (int ix = 0; ix < m_size.x; )
@@ -203 +209 @@
 
             // Chop left side if necessary, but no more than todo
-            int tochop = Min(todo, Max(x1 - ix, 0));
+            int tochop = Min(todo, Max(pos1.x - ix, 0));
 
             ix += tochop;
@@ -211 +217 @@
 
             // Chop right side if necessary and process the remaining pixels
-            int count = Min(todo, Max(x2 - ix, 0));
+            int count = Min(todo, Max(pos2.x - ix, 0));
 
             if (N == NORMAL || N == SCANLINE)
@@ -229 +235 @@
                 uint8_t *sl = screen_line, *sl2 = datap;
                 while (count--)
-                    *sl++ = remap[*sl2++];
+                    *sl++ = map[*sl2++];
             }
             else if (N == REMAP2)
@@ -235 +241 @@
                 uint8_t *sl = screen_line, *sl2 = datap;
                 while (count--)
-                    *sl++ = remap2[remap[*sl2++]];
+                    *sl++ = map2[map[*sl2++]];
             }
             else if (N == FADE || N == FADE_TINT || N == BLEND)
             {
                 uint8_t *sl = screen_line;
-                uint8_t *sl2 = (N == BLEND) ? blend_line + x + ix - bx : sl;
+                uint8_t *sl2 = (N == BLEND) ? blend_line + pos.x + ix - bpos.x
+                                            : sl;
                 uint8_t *sl3 = datap;
 
@@ -246 +253 @@
                 {
                     uint8_t *p1 = paddr + 3 * *sl2++;
-                    uint8_t *p2 = paddr + 3 * (N == FADE_TINT ? tint[*sl3++] : *sl3++);
+                    uint8_t *p2 = paddr + 3 * (N == FADE_TINT ? tint[*sl3++]
+                                                              : *sl3++);
 
                     uint8_t r = ((((int)p1[0] - p2[0]) * mul) >> 16) + p2[0];
@@ -265 +273 @@
 }
 
-void trans_image::PutImage(image *screen, int x, int y)
-{
-    PutImageGeneric<NORMAL>(screen, x, y, 0, NULL, 0, 0, NULL, NULL,
+void TImage::PutImage(image *screen, vec2i pos)
+{
+    PutImageGeneric<NORMAL>(screen, pos, 0, NULL, 0, NULL, NULL,
                             0, 1, NULL, NULL, NULL);
 }
 
-void trans_image::PutRemap(image *screen, int x, int y, uint8_t *remap)
-{
-    PutImageGeneric<REMAP>(screen, x, y, 0, NULL, 0, 0, remap, NULL,
+void TImage::PutRemap(image *screen, vec2i pos, uint8_t *map)
+{
+    PutImageGeneric<REMAP>(screen, pos, 0, NULL, 0, map, NULL,
                            0, 1, NULL, NULL, NULL);
 }
 
-void trans_image::PutDoubleRemap(image *screen, int x, int y,
-                                 uint8_t *remap, uint8_t *remap2)
-{
-    PutImageGeneric<REMAP2>(screen, x, y, 0, NULL, 0, 0, remap, remap2,
+void TImage::PutDoubleRemap(image *screen, vec2i pos,
+                            uint8_t *map, uint8_t *map2)
+{
+    PutImageGeneric<REMAP2>(screen, pos, 0, NULL, 0, map, map2,
                             0, 1, NULL, NULL, NULL);
 }
 
 // Used when eg. the player teleports, or in rocket trails
-void trans_image::PutFade(image *screen, int x, int y,
-                          int amount, int total_frames,
-                          color_filter *f, palette *pal)
-{
-    PutImageGeneric<FADE>(screen, x, y, 0, NULL, 0, 0, NULL, NULL,
+void TImage::PutFade(image *screen, vec2i pos, int amount, int total_frames,
+                     color_filter *f, palette *pal)
+{
+    PutImageGeneric<FADE>(screen, pos, 0, NULL, 0, NULL, NULL,
                           amount, total_frames, NULL, f, pal);
 }
 
-void trans_image::PutFadeTint(image *screen, int x, int y,
-                              int amount, int total_frames,
-                              uint8_t *tint, color_filter *f, palette *pal)
-{
-    PutImageGeneric<FADE_TINT>(screen, x, y, 0, NULL, 0, 0, NULL, NULL,
+void TImage::PutFadeTint(image *screen, vec2i pos, int amount, int total_frames,
+                         uint8_t *tint, color_filter *f, palette *pal)
+{
+    PutImageGeneric<FADE_TINT>(screen, pos, 0, NULL, 0, NULL, NULL,
                                amount, total_frames, tint, f, pal);
 }
 
-void trans_image::PutColor(image *screen, int x, int y, uint8_t color)
-{
-    PutImageGeneric<COLOR>(screen, x, y, color, NULL, 0, 0, NULL, NULL,
+void TImage::PutColor(image *screen, vec2i pos, uint8_t color)
+{
+    PutImageGeneric<COLOR>(screen, pos, color, NULL, 0, NULL, NULL,
                            0, 1, NULL, NULL, NULL);
 }
@@ -309 +315 @@
 // This method is unused but is believed to work.
 // Assumes that the blend image completely covers the transparent image.
-void trans_image::PutBlend(image *screen, int x, int y,
-                           image *blend, int bx, int by,
-                           int amount, color_filter *f, palette *pal)
-{
-    PutImageGeneric<BLEND>(screen, x, y, 0, blend, bx, by, NULL, NULL,
+void TImage::PutBlend(image *screen, vec2i pos, image *blend, vec2i bpos,
+                      int amount, color_filter *f, palette *pal)
+{
+    PutImageGeneric<BLEND>(screen, pos, 0, blend, bpos, NULL, NULL,
                            amount, 1, NULL, f, pal);
 }
 
-void trans_image::PutFilled(image *screen, int x, int y, uint8_t color)
-{
-    PutImageGeneric<FILLED>(screen, x, y, color, NULL, 0, 0, NULL, NULL,
+void TImage::PutFilled(image *screen, vec2i pos, uint8_t color)
+{
+    PutImageGeneric<FILLED>(screen, pos, color, NULL, 0, NULL, NULL,
                             0, 1, NULL, NULL, NULL);
 }
 
-void trans_image::PutPredator(image *screen, int x, int y)
-{
-    PutImageGeneric<PREDATOR>(screen, x, y, 0, NULL, 0, 0, NULL, NULL,
+void TImage::PutPredator(image *screen, vec2i pos)
+{
+    PutImageGeneric<PREDATOR>(screen, pos, 0, NULL, 0, NULL, NULL,
                               0, 1, NULL, NULL, NULL);
 }
 
-void trans_image::PutScanLine(image *screen, int x, int y, int line)
-{
-    PutImageGeneric<SCANLINE>(screen, x, y, 0, NULL, 0, 0, NULL, NULL,
+void TImage::PutScanLine(image *screen, vec2i pos, int line)
+{
+    PutImageGeneric<SCANLINE>(screen, pos, 0, NULL, 0, NULL, NULL,
                               line, 1, NULL, NULL, NULL);
 }
 
-size_t trans_image::MemUsage()
+size_t TImage::MemUsage()
 {
     uint8_t *d = m_data;

abuse/trunk/src/imlib/timage.h

@@ -25 +25 @@
  */
 
-class trans_image // transparent image
+class TImage // transparent image
 {
 public:
-    trans_image(image *im, char const *name);
-    ~trans_image();
+    TImage(image *im, char const *name);
+    ~TImage();
 
     inline vec2i Size() { return m_size; }
@@ -36 +36 @@
     image *ToImage();
 
-    void PutImage(image *screen, int x, int y); // always transparent
-    void PutRemap(image *screen, int x, int y, uint8_t *remap);
-    void PutDoubleRemap(image *screen, int x, int y,
-                        uint8_t *remap, uint8_t *remap2);
-    void PutFade(image *screen, int x, int y, int amount, int total_frames,
+    void PutImage(image *screen, vec2i pos);
+    void PutRemap(image *screen, vec2i pos, uint8_t *map);
+    void PutDoubleRemap(image *screen, vec2i pos, uint8_t *map, uint8_t *map2);
+    void PutFade(image *screen, vec2i pos, int amount, int total_frames,
                  color_filter *f, palette *pal);
-    void PutFadeTint(image *screen, int x, int y, int amount, int total_frames,
+    void PutFadeTint(image *screen, vec2i pos, int amount, int total_frames,
                      uint8_t *tint, color_filter *f, palette *pal);
-    void PutColor(image *screen, int x, int y, uint8_t color);
-    void PutFilled(image *screen, int x, int y, uint8_t color);
-    void PutPredator(image *screen, int x, int y);
-    void PutBlend(image *screen, int x, int y, image *blend, int bx, int by,
+    void PutColor(image *screen, vec2i pos, uint8_t color);
+    void PutFilled(image *screen, vec2i pos, uint8_t color);
+    void PutPredator(image *screen, vec2i pos);
+    void PutBlend(image *screen, vec2i pos, image *blend, vec2i bpos,
                   int blend_amount, color_filter *f, palette *pal);
-    void PutScanLine(image *screen, int x, int y, int line);
+    void PutScanLine(image *screen, vec2i pos, int line);
 
     size_t MemUsage();
 
 private:
-    uint8_t *ClipToLine(image *screen, int x1, int y1, int x2, int y2,
-                        int x, int &y, int &ysteps);
+    uint8_t *ClipToLine(image *screen, vec2i pos1, vec2i pos2,
+                        vec2i &posy, int &ysteps);
 
     enum PutMode { NORMAL, REMAP, REMAP2, FADE, FADE_TINT, COLOR,
                    FILLED, PREDATOR, BLEND, SCANLINE };
     template<int N>
-    void PutImageGeneric(image *dest, int x, int y, uint8_t color,
-                         image *blend, int bx, int by,
+    void PutImageGeneric(image *dest, vec2i pos, uint8_t color,
+                         image *blend, vec2i bpos,
                          uint8_t *map1, uint8_t *map2, int amount,
                          int total_frames, uint8_t *tint,

abuse/trunk/src/items.cpp

@@ -261 +261 @@
 
 
-  im=new trans_image(img,"foretile");
+  im=new TImage(img,"foretile");
   delete img;
 
@@ -283 +283 @@
 {
   image *im=load_image(fp);
-  forward=new trans_image(im,"figure data");
+  forward=new TImage(im,"figure data");
   im->FlipX();
-  backward=new trans_image(im,"figure backward data");
+  backward=new TImage(im,"figure backward data");
   delete im;
 

abuse/trunk/src/items.h

@@ -44 +44 @@
 {
 public :
-  trans_image *im;
+  TImage *im;
   uint16_t next;
   uint8_t damage;
@@ -61 +61 @@
 {
 public :
-  trans_image *forward,*backward;
+  TImage *forward,*backward;
   uint8_t hit_damage,xcfg;
   int8_t advance;

abuse/trunk/src/morpher.cpp

@@ -58 +58 @@
 
     fleft=frames;
-    trans_image *h1=new trans_image(cache.img(t1->morph_mask),"morph tmp"),
-                *h2=new trans_image(cache.img(t2->morph_mask),"morph tmp");
+    TImage *h1=new TImage(cache.img(t1->morph_mask),"morph tmp"),
+                *h2=new TImage(cache.img(t2->morph_mask),"morph tmp");
     super_morph *sm=new super_morph(h1,h2,anneal,stat_fun);
     if (sm->t)

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));
     }
   }

abuse/trunk/src/objects.h

@@ -107 +107 @@
   game_object *bmove(int &whit, game_object *exclude);  // ballestic move, return hit object,
                                                         // or NULL (whit is 1 if hit wall)
-  trans_image *picture() { return current_sequence()->get_frame(current_frame,direction); }
+  TImage *picture() { return current_sequence()->get_frame(current_frame,direction); }
 
   int next_picture();

abuse/trunk/src/seq.h

@@ -30 +30 @@
   int next_frame(short &current) { current++; if (current>=total) { current=0; return 0; } return 1; }
   int last_frame(short &current) { current--; if (current<0) { current=total-1; return 0; } return 1; }
-  trans_image  *get_frame(short current, int direction)
+  TImage  *get_frame(short current, int direction)
    { if (direction>0) return cache.fig(seq[current])->forward;
                  else return cache.fig(seq[current])->backward; }