Changeset 653Tweet

Timestamp:

May 14, 2011, 4:00:53 PM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: remove unused code and tag unused method arguments.

Location:

abuse/trunk/src

Files:

• go.h (modified) (1 diff)
• imlib/image.h (modified) (1 diff)
• imlib/input.h (modified) (1 diff)
• imlib/jwindow.h (modified) (1 diff)
• imlib/palette.cpp (modified) (6 diffs)
• imlib/palette.h (modified) (2 diffs)
• level.cpp (modified) (5 diffs)
• objects.h (modified) (2 diffs)

abuse/trunk/src/go.h

@@ -39 +39 @@
   elevator(FILE *fp, unsigned char *state_remap);
   virtual int size();
-  virtual void recieve_signal(long signal) { ; }
+  virtual void receive_signal(long signal) { (void)signal; }
   virtual game_objects type() { return O_elevator; }
   virtual ifield *make_fields(int ystart, ifield *Next);

abuse/trunk/src/imlib/image.h

@@ -25 +25 @@
 {
 public :
-  int16_t dx1,dy1,dx2,dy2;
-  dirty_rect(int16_t x1, int16_t y1, int16_t x2, int16_t y2)
-  { dx1=x1; dy1=y1; dx2=x2; dy2=y2;
-    if(x2<x1 || y2<y1)
-      printf("add incorrect dirty\n");
-  }
-  virtual int16_t compare(void *n1, int16_t field)
-  { return((dirty_rect *)n1)->dy1>dy1; }
-} ;
+    int16_t dx1, dy1, dx2, dy2;
+    dirty_rect(int16_t x1, int16_t y1, int16_t x2, int16_t y2)
+    {
+        dx1 = x1; dy1 = y1; dx2 = x2; dy2 = y2;
+        if (x2 < x1 || y2 < y1)
+            printf("add incorrect dirty\n");
+    }
+    virtual int compare(void *n1) { return ((dirty_rect *)n1)->dy1 > dy1; }
+};
 
 class image_descriptor

abuse/trunk/src/imlib/input.h

@@ -103 +103 @@
   virtual void area(int &x1, int &y1, int &x2, int &y2);
   virtual void draw_first(image *screen);
-  virtual void draw(int active, image *screen) { ; }
-  virtual void handle_event(Event &ev, image *screen, InputManager *im) { ; }
+  virtual void draw(int active, image *screen) { (void)active; (void)screen; }
+  virtual void handle_event(Event &ev, image *screen, InputManager *im)
+  {
+      (void)ev; (void)screen; (void)im;
+  }
   virtual char *read() { return text; }
   virtual int selectable() { return 0; }

abuse/trunk/src/imlib/jwindow.h

@@ -77 +77 @@
     virtual void handle_event(Event &ev, image *screen, InputManager *im) = 0;
     virtual int selectable() { return 1; }
-    virtual void remap(Filter *f) { ; }
+    virtual void remap(Filter *f) { (void)f; }
     virtual char *read() = 0;
     virtual ifield *find(int search_id) { if (id==search_id) return this; else return NULL; }
-    virtual ifield *unlink(int id) { return NULL; }
+    virtual ifield *unlink(int id) { (void)id; return NULL; }
     virtual ~ifield();
 } ;

abuse/trunk/src/imlib/palette.cpp

@@ -56 +56 @@
 }
 
-int palette::find_closest(unsigned char r, unsigned char g, unsigned char b)
+int palette::find_closest(uint8_t r, uint8_t g, uint8_t b)
 {
    unsigned char *cl=(unsigned char *)addr();
@@ -71 +71 @@
 }
 
-
-int palette::find_closest_non0(unsigned char r, unsigned char g, unsigned char b)
-{
-   unsigned char *cl=(unsigned char *)addr()+3;
-   int c=1,d=0x7fffffff,i,nd;
-   for (i=1; i<256; i++)
-   {
-     nd=((int)r-(int)(*cl))*((int)r-(int)(*cl)); cl++;
-     nd+=((int)g-(int)(*cl))*((int)g-(int)(*cl)); cl++;
-     nd+=((int)b-(int)(*cl))*((int)b-(int)(*cl)); cl++;
-     if (nd<d)
-     { c=i; d=nd; }
-   }
-   return c;
-}
-
-
-int palette::find_color(unsigned char r, unsigned char g, unsigned char b)
+int palette::find_color(uint8_t r, uint8_t g, uint8_t b)
 {
   int i,ub,mask,find;
@@ -210 +193 @@
   b=color_num%8;
   return (usd[x]&(128>>b));
-}
-
-int palette::add_color(unsigned int r, int unsigned g, int unsigned b, int closest_only)
-{
-  int i,f,u,c;
-  if (!closest_only)
-  {
-    for (i=ncolors-1,f=-1,u=-1; i>=0 && f<0; i--)
-    {
-      if (used(i))
-      {
-        if (pal[i].red==r && pal[i].green==g && pal[i].blue==b)
-    f=i;
-      }
-      else
-        u=i;
-    }
-  } else { f=-1; u=-1; }
-  if (f<0)
-  {
-    if (u>=0)
-    { pal[u].red=r;
-      pal[u].green=g;
-      pal[u].blue=b;
-      set_used(u);
-      f=u;
-    }
-    else
-    {
-      for (i=0,f=0,u=10000; i<ncolors; i++)
-      { c=(pal[i].red-r)*(pal[i].red-r)+
-      (pal[i].green-g)*(pal[i].green-g)+
-      (pal[i].blue-b)*(pal[i].blue-b);
-    if (c<u)
-    { f=i;
-      u=c;
-    }
-      }
-    }
-  }
-  return f;
 }
 
@@ -430 +372 @@
 }
 
-void quant_palette::add_color(unsigned char r, unsigned char g, unsigned char b)
-{
-  quant_node **p,*fat;
-  int lev,cn,stop;
-  p=&root;
-  lev=0;
-  stop=0;
-  fat=NULL;
-  if (nc>=mx-1)
-    prune();
-  while (!stop)
-  {
-    lev++;
-    if (!(*p))
-    {
-      if (lev>2 && !fat)
-    printf("h");
-      (*p)=new quant_node(lev,fat);
-      level[lev-1].add_end(*p);
-    }
-
-    if (!(*p)->is_leaf())
-    {
-      cn=((r&(256>>lev))!=0)<<2;
-      cn+=((g&(256>>lev))!=0)<<1;
-      cn+=((b&(256>>lev))!=0);
-      fat=(*p);
-      p=&((*p)->children[cn]);
-    } else stop=1;
-
-  }
-  (*p)->set(r,g,b);
-  if (!(*p)->tot)
-    nc++;
-  (*p)->tot++;
-}
-
-palette *quant_palette::create_pal()
-{
-  palette *p;
-  int i,x;
-  quant_node *pn;
-  p=new palette(mx);
-  for (x=0,i=7; i>=0; i++)
-    for (pn=(quant_node *)level[i].first();
-     pn!=(quant_node *)level[i].first(); pn=(quant_node *)pn->Next())
-      if (pn->is_leaf())
-    p->set(x++,pn->red,pn->green,pn->blue);
-  return p;
-}
-
 quant_palette::~quant_palette()
 {
@@ -490 +381 @@
 }
 
-unsigned char palette::brightest(int all)
-{ unsigned char r,g,b,bri;
+uint8_t palette::brightest(int all)
+{ uint8_t r,g,b,bri;
   unsigned i;
   long brv;
@@ -510 +401 @@
 }
 
-unsigned char palette::darkest(int all, int noblack)
-{ unsigned char r,g,b,bri;
+uint8_t palette::darkest(int all, int noblack)
+{ uint8_t r,g,b,bri;
   unsigned i;
   long brv,x;

abuse/trunk/src/imlib/palette.h

@@ -59 +59 @@
   void set_all_used();
   void set_all_unused();
-  void set_background(unsigned char b)  { bg=b; }
-  int background(unsigned char b)  { return bg; }
-  int add_color(unsigned int r, unsigned int g, unsigned int b,
-             int closest_only=0);
-  int find_color(unsigned char r, unsigned char g, unsigned char b);
-  int find_closest(unsigned char r, unsigned char g, unsigned char b);
-  int find_closest_non0(unsigned char r, unsigned char g, unsigned char b);
+  int find_color(uint8_t r, uint8_t g, uint8_t b);
+  int find_closest(uint8_t r, uint8_t g, uint8_t b);
   palette *copy();
-  unsigned char brightest(int all=0);
-  unsigned char darkest(int all=0, int noblack=1);
+  uint8_t brightest(int all=0);
+  uint8_t darkest(int all=0, int noblack=1);
   int write(bFILE *fp);
   int size();
@@ -101 +96 @@
   void re_delete(quant_node *who, int lev);
 public :
-  void add_color(unsigned char r, unsigned char g, unsigned char b);
   quant_palette(int max_colors=256);
-  palette *create_pal();
   ~quant_palette();
 } ;

abuse/trunk/src/level.cpp

@@ -399 +399 @@
 void level::check_collisions()
 {
-  game_object *target,*reciever=NULL;
+  game_object *target,*receiver=NULL;
   int32_t sx1,sy1,sx2,sy2,tx1,ty1,tx2,ty2,hitx,hity,
       s_centerx,t_centerx;
@@ -409 +409 @@
 
     int hit=0;
-    reciever=NULL;
+    receiver=NULL;
     for (target=first_active; target; target=target->next_active)
     {
@@ -456 +456 @@
         if (x2!=_x2 || _y2!=y2)
         {
-          reciever=target;
+          receiver=target;
           hitx=((x1+x2)/2+(xp1+xp2)/2)/2;
           hity=((y1+y1)/2+(yp1+yp2)/2)/2;
@@ -467 +467 @@
       }
     }
-    if (reciever)
-    {
-      reciever->do_damage((int)subject->current_figure()->hit_damage,subject,hitx,hity,0,0);
-      subject->note_attack(reciever);
+    if (receiver)
+    {
+      receiver->do_damage((int)subject->current_figure()->hit_damage,subject,hitx,hity,0,0);
+      subject->note_attack(receiver);
       hit=1;
     }
@@ -2769 +2769 @@
     game_object *o=first_active;
     for (; o; o=o->next_active)
-      o->recieve_signal(signal);
+      o->receive_signal(signal);
   }
 }

abuse/trunk/src/objects.h

@@ -63 +63 @@
   int decide();        // returns 0 if you want to be deleted
   int type() { return otype; }
-  ifield *make_fields(int ystart, ifield *Next) { return NULL ; }
-  void gather_input(InputManager *inm) { ; }
+  ifield *make_fields(int ystart, ifield *Next)
+  {
+    (void)ystart; (void)Next;
+    return NULL;
+  }
+  void gather_input(InputManager *inm) { (void)inm; }
   int hurt_all() { return figures[otype]->get_cflag(CFLAG_HURT_ALL); }
   int stoppable() { return figures[otype]->get_cflag(CFLAG_STOPPABLE); }
@@ -87 +91 @@
 
   void note_attack(game_object *whom);
-  void recieve_signal(long singal) { ; }
+  void receive_signal(long signal) { (void)signal; }
   int push_range();
   int can_hurt(game_object *who);     // collision checking will ask first to see if you