Ignore:
Timestamp:
Apr 17, 2011, 11:56:44 PM (12 years ago)
Author:
Sam Hocevar
Message:

style: remove trailing spaces, fix copyright statements.

Location:
abuse/trunk/src/imlib
Files:
62 edited

Legend:

Unmodified
Added
Removed

  • abuse/trunk/src/imlib/bitmap.h

    r57 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/conio.h

    r57 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/convert.cpp

    r124 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    2627  if (STReq(argv[1],"2unix"))
    2728  { strip=1; add=0; }
    28   else {strip=0; add=1; }
     29  else { strip=0; add=1; }
    2930  printf("Converting...\n");
    30   for (i=2;i<argc;i++)
     31  for (i=2; i<argc; i++)
    3132  {
    3233    printf("  %s\n",argv[i]);

  • abuse/trunk/src/imlib/dprint.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/dprint.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/event.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/filesel.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    3435{
    3536  int i=0;
    36   for (;i<tf;i++)
     37  for (; i<tf; i++)
    3738    free(f[i]);
    38   for (i=0;i<td;i++)
     39  for (i=0; i<td; i++)
    3940    free(d[i]);
    4041  if (tf) free(f);
    … …  
    6364      wid=0;
    6465      int i=0;
    65       for (;i<tf;i++)
     66      for (; i<tf; i++)
    6667      if ((int)strlen(f[i])>wid) wid=strlen(f[i]);
    67       for (i=0;i<td;i++)
     68      for (i=0; i<td; i++)
    6869      if ((int)strlen(d[i])+2>wid) wid=strlen(d[i])+2;
    6970      sx=0;
    … …  
    109110  wid=0;
    110111  int i=0;
    111   for (;i<tf;i++)
     112  for (; i<tf; i++)
    112113    if ((int)strlen(f[i])>wid) wid=strlen(f[i]);
    113   for (i=0;i<td;i++)
     114  for (i=0; i<td; i++)
    114115    if ((int)strlen(d[i])+2>wid) wid=strlen(d[i])+2;
    115116  reconfigure();

  • abuse/trunk/src/imlib/filesel.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/filter.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    2627
    2728  int dk=to->darkest(1);
    28   for (int i=0;i<nc;i++,p++,r+=3,g+=3,b+=3)
     29  for (int i=0; i<nc; i++,p++,r+=3,g+=3,b+=3)
    2930  {
    3031    *p=to->find_closest(*r,*g,*b);
    … …  
    4041{
    4142  int i;
    42   for (i=0;i<nc;i++)
     43  for (i=0; i<nc; i++)
    4344    fdat[i]=i;
    4445}
    … …  
    4849  int i;
    4950  CONDITION(minv>=0 && minv<nc,"Bad minv");
    50   for (i=0;i<minv;i++)
     51  for (i=0; i<minv; i++)
    5152    fdat[i]=blank;
    5253}
    … …  
    5657  int i;
    5758  CONDITION(maxv>=0 && maxv<nc,"bad maxv value in filter::max_thresh");
    58   for (i=nc-1;i>=maxv;i--)
     59  for (i=nc-1; i>=maxv; i--)
    5960    fdat[i]=(unsigned) blank;
    6061}
    … …  
    8384  CONDITION(im,"null image passed in filter::apply\n");
    8485  im->lock();
    85   for (y=im->height()-1;y>=0;y--)
     86  for (y=im->height()-1; y>=0; y--)
    8687  {
    8788    c=im->scan_line(y);
    88     for (x=im->width()-1;x>=0;x--)
     89    for (x=im->width()-1; x>=0; x--)
    8990    {
    9091      CONDITION((unsigned) c[x]<nc,"not enough filter colors");
    … …  
    122123  int colors=1<<color_bits;
    123124  color_table=(unsigned char *)malloc(colors*colors*colors);
    124   for (r=0;r<colors;r++)
     125  for (r=0; r<colors; r++)
    125126  {
    126127    if (stat_fun) stat_fun(r);
    127128    rv=r<<lshift;
    128     for (g=0;g<colors;g++)
     129    for (g=0; g<colors; g++)
    129130    {
    130131      gv=g<<lshift;
    131       for (b=0;b<colors;b++)
     132      for (b=0; b<colors; b++)
    132133      {
    133134    bv=b<<lshift;
    134135        best=0x7fffffff;
    135         for (i=0,pp=(unsigned char *)pal->addr();i<max;i++)
     136        for (i=0,pp=(unsigned char *)pal->addr(); i<max; i++)
    136137        {
    137138          register long rd=*(pp++)-rv,
    138139                        gd=*(pp++)-gv,
    139140                        bd=*(pp++)-bv;
    140    
     141
    141142          dist_sqr=(long)rd*rd+(long)bd*bd+(long)gd*gd;
    142143          if (dist_sqr<best)
    … …  
    220221        for(i = 0, source = &pg2[x1], dest = &pg1[x];
    221222            i < xl;
    222             i++, source++, dest++)   
     223            i++, source++, dest++)
    223224        {
    224225            if(!transparent || *source != current_background)

  • abuse/trunk/src/imlib/filter.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/fonts.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    6667  int ch;
    6768
    68   for (ch=0;ch<256;ch++)
     69  for (ch=0; ch<256; ch++)
    6970  {
    7071    tmp.clear();
    … …  
    7879{
    7980  int ch;
    80   for (ch=0;ch<256;ch++)
     81  for (ch=0; ch<256; ch++)
    8182    delete let[ch];
    8283}

  • abuse/trunk/src/imlib/fonts.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/glview.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    4950    i++;
    5051  }
    51   for (j=0;j<100;j++)
     52  for (j=0; j<100; j++)
    5253  {
    53     for (k=1;k<t;k++)
     54    for (k=1; k<t; k++)
    5455    {
    5556      im[k]->put_image(screen,0,0);
    … …  
    5859      screen->bar(0,0,im[k]->width(),im[k]->height(),0);
    5960    }
    60     for (k=t-1;k>0;k--)
     61    for (k=t-1; k>0; k--)
    6162    {
    6263      im[k]->put_image(screen,0,0);

  • abuse/trunk/src/imlib/guistat.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    9293    if (len2>len1) len3=len2; else len3=len1;
    9394    wx-=len3/2;
    94    
    95    
     95
     96
    9697    gui_status_node *p=first->next;
    9798    while (p && !p->stat_win) p=p->next;

  • abuse/trunk/src/imlib/guistat.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/image.cpp

    r490 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    11271128{
    11281129  int16_t x, y, i, j;
    1129   uint8_t dt_matrix[]={0,  136, 24, 170,
     1130  uint8_t dt_matrix[]={ 0,  136, 24, 170,
    11301131           68, 204, 102, 238,
    11311132           51, 187, 17, 153,
    … …  
    13481349{
    13491350  char st[100];
    1350   int16_t ledx[]={1, 2, 1, 2, 3, 3, 3, 3, 1, 2, 0, 0, 0, 0};
    1351   int16_t ledy[]={3, 3, 0, 0, 1, 2, 4, 6, 7, 7, 4, 6, 1, 2};
    1352 
    1353   int16_t dig[]={2+4+8+16+32+64, 4+8, 2+4+1+32+16, 2+4+1+8+16, 64+1+4+8,
     1351  int16_t ledx[]={ 1, 2, 1, 2, 3, 3, 3, 3, 1, 2, 0, 0, 0, 0};
     1352  int16_t ledy[]={ 3, 3, 0, 0, 1, 2, 4, 6, 7, 7, 4, 6, 1, 2};
     1353
     1354  int16_t dig[]={ 2+4+8+16+32+64, 4+8, 2+4+1+32+16, 2+4+1+8+16, 64+1+4+8,
    13541355             2+64+1+8+16, 64+32+1+8+16, 2+4+8, 1+2+4+8+16+32+64, 64+2+4+1+8, 1};
    13551356  int16_t xx, yy, zz;
    … …  
    13721373}
    13731374
    1374 uint8_t dither_matrix[]={0,  136, 24, 170,
     1375uint8_t dither_matrix[]={ 0,  136, 24, 170,
    13751376             68, 204, 102, 238,
    13761377             51, 187, 17, 153,

  • abuse/trunk/src/imlib/image.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/include.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    1920  unsigned int j;
    2021  int append=0,i;
    21   for (j=0;j<strlen(name);j++)
     22  for (j=0; j<strlen(name); j++)
    2223    if (toupper(tmp_name[j])<'A' || toupper(tmp_name[j])>'Z')
    2324      tmp_name[j]='_';
    … …  
    4142      fprintf(fp,"unsigned char %s_palette[256*3] = {\n    ",tmp_name);
    4243      unsigned char *p=(unsigned char *)pal->addr();
    43       for (i=0;i<768;i++,p++)
     44      for (i=0; i<768; i++,p++)
    4445      {
    4546    fprintf(fp,"%d",(int)*p);
    … …  
    5556            im->width(),im->height());
    5657    int x,y,max=im->width()*im->height()-1;
    57     for (y=0,i=0;y<im->height();y++)
    58       for (x=0;x<im->width();x++,i++)
     58    for (y=0,i=0; y<im->height(); y++)
     59      for (x=0; x<im->width(); x++,i++)
    5960      {
    6061        fprintf(fp,"%d",(int)im->pixel(x,y));

  • abuse/trunk/src/imlib/include.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/input.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    3233void button_box::remap(filter *f)
    3334{
    34   for (button *b=buttons;b;b=(button *)b->next)
     35  for (button *b=buttons; b; b=(button *)b->next)
    3536    b->remap(f);
    3637}
    … …  
    3940{
    4041  if (search_id==id) return this;
    41   for (ifield *i=(ifield *)buttons;i;i=i->next)
     42  for (ifield *i=(ifield *)buttons; i; i=i->next)
    4243    if (search_id==i->id) return i;
    4344  return NULL;
    … …  
    7071    b->area(x1,y1,x2,y2);
    7172    int xp1,yp1,xp2,yp2;
    72     for (b=(button *)b->next;b;b=(button *)b->next)
     73    for (b=(button *)b->next; b; b=(button *)b->next)
    7374    {
    7475      b->area(xp1,yp1,xp2,yp2);
    … …  
    8384void button_box::draw_first(image *screen)
    8485{
    85   for (button *b=buttons;b;b=(button *)b->next)
     86  for (button *b=buttons; b; b=(button *)b->next)
    8687    b->draw_first(screen);
    8788}
    … …  
    102103char *button_box::read()
    103104{
    104   for (button *b=buttons;b;b=(button *)b->next)
     105  for (button *b=buttons; b; b=(button *)b->next)
    105106  {
    106107    if (*((int *)b->read())==0)
    … …  
    118119      int x1,y1,x2,y2;
    119120      int found=0;
    120       for (button *b=buttons;!found && b;b=(button *)b->next)  // see if the user clicked on a button
     121      for (button *b=buttons; !found && b; b=(button *)b->next)  // see if the user clicked on a button
    121122      {
    122123    b->area(x1,y1,x2,y2);
    … …  
    128129      int total=0;
    129130      button *b2=buttons;
    130       for (;b2;b2=(button *)b2->next)
     131      for (; b2; b2=(button *)b2->next)
    131132        if (*((int *)b2->read())==0)
    132133          total++;
    … …  
    136137        if (total>maxdown)
    137138        {
    138           for (b2=buttons;total>maxdown && b2;b2=(button *)b2->next)
     139          for (b2=buttons; total>maxdown && b2; b2=(button *)b2->next)
    139140            if ((b!=b2 || maxdown==0) && *((int *)b2->read())==0)
    140141        {
    … …  
    168169  button *b=buttons;
    169170  int x_on=x,x1,y1,x2,y2;
    170   for (;b;b=(button *)b->next)
     171  for (; b; b=(button *)b->next)
    171172  {
    172173    b->area(x1,y1,x2,y2);
    … …  
    181182  button *b=buttons;
    182183  int y_on=y,x1,y1,x2,y2;
    183   for (;b;b=(button *)b->next)
     184  for (; b; b=(button *)b->next)
    184185  {
    185186    b->area(x1,y1,x2,y2);
    … …  
    285286      case JK_BACKSPACE : if (cur)
    286287         { draw_cur(wm->dark_color(),screen); cur--;
    287            for (xx=cur;xx<(int)strlen(format)-1;xx++)
     288           for (xx=cur; xx<(int)strlen(format)-1; xx++)
    288289             data[xx]=data[xx+1];
    289290           data[strlen(format)-1]=' ';
    … …  
    295296         {
    296297           draw_cur(wm->dark_color(),screen);
    297            for (xx=strlen(format)-1;xx>cur && xx>0;xx--)
     298           for (xx=strlen(format)-1; xx>cur && xx>0; xx--)
    298299             data[xx]=data[xx-1];
    299300           data[cur]=ev.key;
    … …  
    473474    int fw=wm->font()->width(),fh=wm->font()->height(),maxw=0;
    474475    char *info=text;
    475     for (w=fw,h=fh+1;*info;info++)
     476    for (w=fw,h=fh+1; *info; info++)
    476477    {
    477478      if (w>maxw) maxw=w;

  • abuse/trunk/src/imlib/input.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/jdir.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/jrand.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    2425  int i;
    2526  unsigned short *tp=rtable;
    26   for (i=0;i<RAND_TABLE_SIZE;i++,tp++)
     27  for (i=0; i<RAND_TABLE_SIZE; i++,tp++)
    2728  {
    2829    rseed=rseed*0x41c64e6d+12345;

  • abuse/trunk/src/imlib/jrand.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/jwindow.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    4344int WindowManager::window_in_area(int x1, int y1, int x2, int y2)
    4445{
    45   for (Jwindow *f=first;f;f=f->next)
     46  for (Jwindow *f=first; f; f=f->next)
    4647    if (f->x<=x2 && f->y<=y2 && f->x+f->l-1>=x1 && f->y+f->h-1>=y1)
    4748      return 1;
    … …  
    6465{
    6566  Jwindow *p;
    66   for (p=first;p;p=p->next)
     67  for (p=first; p; p=p->next)
    6768  {
    6869    if (!p->is_hidden())
    … …  
    7778{
    7879  Jwindow *p;
    79   for (p=first;p;p=p->next)
     80  for (p=first; p; p=p->next)
    8081    if (p->is_hidden())
    8182      show_window(p);
    … …  
    8990  else
    9091  {
    91     for (k=first;k->next!=j;k=k->next)
     92    for (k=first; k->next!=j; k=k->next)
    9293      k->screen->add_dirty(j->x-k->x,j->y-k->y,
    9394                   j->x+j->l-1-k->x,j->y+j->h-1-k->y);
    … …  
    120121  if (state==inputing)
    121122  {
    122     for (ev.window=NULL,j=first;j;j=j->next)
     123    for (ev.window=NULL,j=first; j; j=j->next)
    123124      if (!j->is_hidden() && ev.mouse_move.x>=j->x && ev.mouse_move.y>=j->y &&
    124125          ev.mouse_move.x<j->x+j->l && ev.mouse_move.y<j->y+j->h)
    … …  
    148149        ev.type=EV_CLOSE_WINDOW;
    149150      else if (movew)
    150       {   
     151      {
    151152    int red=0;
    152153    if (ev.window==first)       // see if we need to raise the window
    … …  
    159160    {
    160161      Jwindow *last=first;
    161       for (;last->next!=ev.window;last=last->next);
     162      for (; last->next!=ev.window; last=last->next);
    162163      if (ev.window->next)
    163164        red=1;
    … …  
    169170    {
    170171      Jwindow *last=first;
    171       for (;last->next;last=last->next);
     172      for (; last->next; last=last->next);
    172173      last->next=ev.window;
    173174    }
    … …  
    177178      Jwindow *j=ev.window;
    178179/*      screen->add_dirty(j->x,j->y,j->x+j->l-1,j->y+j->h-1);
    179       for (p=first;p!=j;p=p->next)
    180         p->screen->add_dirty(j->x-p->x,j->y-p->y,j->x+j->l-1-p->x,j->y+j->h-1-p->y);*/
     180      for (p=first; p!=j; p=p->next)
     181        p->screen->add_dirty(j->x-p->x,j->y-p->y,j->x+j->l-1-p->x,j->y+j->h-1-p->y); */
    181182      j->screen->add_dirty(0,0,j->l-1,j->h-1);
    182183      flush_screen();
    … …  
    209210  if (ev.type==EV_REDRAW)
    210211  {
    211     for (j=first;j;j=j->next)
     212    for (j=first; j; j=j->next)
    212213       j->screen->add_dirty(ev.redraw.x1-j->x,ev.redraw.y1-j->y,
    213214             ev.redraw.x2-j->x,ev.redraw.y2-j->y);
    … …  
    228229  Jwindow *p;
    229230  screen->add_dirty(j->x,j->y,j->x+j->l-1,j->y+j->h-1);
    230   for (p=first;p!=j;p=p->next)
     231  for (p=first; p!=j; p=p->next)
    231232    p->screen->add_dirty(j->x-p->x,j->y-p->y,j->x+j->l-1-p->x,j->y+j->h-1-p->y);
    232233  j->resize(l,h);
    … …  
    559560ifield *InputManager::unlink(int id)     // unlinks ID from fields list and return the pointer to it
    560561{
    561   for (ifield *i=first,*last=NULL;i;i=i->next)
     562  for (ifield *i=first,*last=NULL; i; i=i->next)
    562563  {
    563564    if (i->id==id)
    … …  
    615616    if ((ev.type==EV_MOUSE_BUTTON && ev.mouse_button==1) || ev.type==EV_MOUSE_MOVE)
    616617    {
    617       for (i=first;i;i=i->next)
     618      for (i=first; i; i=i->next)
    618619      {
    619620    i->area(x1,y1,x2,y2);
    … …  
    725726void InputManager::remap(filter *f)
    726727{
    727   for (ifield *i=first;i;i=i->next)
     728  for (ifield *i=first; i; i=i->next)
    728729   i->remap(f);
    729730  redraw();
    … …  
    747748{
    748749  ifield *f;
    749   for (f=first;f;f=f->next)
     750  for (f=first; f; f=f->next)
    750751  {
    751752    ifield *ret=f->find(id);

  • abuse/trunk/src/imlib/jwindow.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    175176    JCFont *font() { return fnt; }
    176177    int has_mouse() { return eh->has_mouse(); }
    177     void mouse_status(int &x, int &y, int &button) {eh->mouse_status(x,y,button); }   
     178    void mouse_status(int &x, int &y, int &button) { eh->mouse_status(x,y,button); }
    178179    void set_mouse_shape(image *im, int centerx, int centery)
    179180    { eh->set_mouse_shape(im,centerx,centery); }

  • abuse/trunk/src/imlib/keys.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/keys.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/linked.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/linked.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    1516// example compare function
    1617//   virtual int compare(void *n1, int field)
    17 //        {return ((classname *) n1)->data > data);}
     18//        { return ((classname *) n1)->data > data); }
    1819//  should return (1 if n1 is greater than (self)) else return 0
    1920//  field is the value determined by linked_list::set_sort_field
    … …  
    4849  if (first) \
    4950     for (controll=(type *)(first); \
    50           (!x || (controll)!=(type *)(first));\
     51          (!x || (controll)!=(type *)(first)); \
    5152          controll=(type *)(controll->next()),x++)
    5253
    5354#define loop_forct(type,controll,first,cond,x) int x=0; if (first) for \
    54   (controll=(type *)(first);cond && (!x || controll!=(type *)(first));\
     55  (controll=(type *)(first); cond && (!x || controll!=(type *)(first)); \
    5556  controll=(type *)(controll->next()),x++)
    5657
    … …  
    5960  class linked_node *nextp, *lastp;
    6061public:
    61   virtual int compare(void *n1, int field)     {return(0);}  // default is = (equal)
    62   class linked_node *next()              {return nextp;}
    63   class linked_node *last()              {return lastp;}
    64   void set_next(class linked_node *p)    {nextp=p;}
    65   void set_last(class linked_node *p)    {lastp=p;}
     62  virtual int compare(void *n1, int field)     { return(0); }  // default is = (equal)
     63  class linked_node *next()              { return nextp; }
     64  class linked_node *last()              { return lastp; }
     65  void set_next(class linked_node *p)    { nextp=p; }
     66  void set_last(class linked_node *p)    { lastp=p; }
    6667  virtual ~linked_node() { ; }
    6768  linked_node() { nextp=NULL; lastp=NULL; }
    … …  
    9091  void add_end(class linked_node *p);
    9192  void insert(class linked_node *p);
    92   void set_sort_field(int x) {sortby=x;}   // this is passed to compare
    93   class linked_node *current() {return cn;}
    94   class linked_node *first() {return fn;}
    95   class linked_node *last() {return fn->last();}
     93  void set_sort_field(int x) { sortby=x; }   // this is passed to compare
     94  class linked_node *current() { return cn; }
     95  class linked_node *first() { return fn; }
     96  class linked_node *last() { return fn->last(); }
    9697  class linked_node *get_node(int x);
    97   void set_current(class linked_node *p) {cn=p;}
    98   void go_first() {cn=fn;}
    99   void go_end() {cn=fn->last();}
    100   void go_next() {cn=cn->next();}
    101   void go_last() {cn=cn->last();}
    102   int number_nodes()  {return nn;}
     98  void set_current(class linked_node *p) { cn=p; }
     99  void go_first() { cn=fn; }
     100  void go_end() { cn=fn->last(); }
     101  void go_next() { cn=cn->next(); }
     102  void go_last() { cn=cn->last(); }
     103  int number_nodes()  { return nn; }
    103104  int node_number(linked_node *p);
    104105  int unlink(linked_node *p);

  • abuse/trunk/src/imlib/macs.h

    r490 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/main.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/morph.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    3435    morph_point8 *m8=(morph_point8 *)p;
    3536    screen->lock();
    36     for (i=0;i<total;i++,m8++)
     37    for (i=0; i<total; i++,m8++)
    3738    {
    3839      xx=x+trans(m8->x1,m8->x2,frame_on);
    … …  
    4041
    4142      if (xx>=x1 && xx<=x2 && yy>=y1 && yy<=y2)
    42       {   
     43      {
    4344    pal->get(m8->start_color,r1,g1,b1);
    4445    pal->get(m8->end_color,r2,g2,b2);
    … …  
    4748             g=trans(g1,g2,frame_on)>>3,
    4849         b=trans(b1,b2,frame_on)>>3;
    49    
     50
    5051        *(screen->scan_line(yy)+xx)=fli->lookup_color(r,g,b);
    5152      }
    … …  
    125126
    126127
    127   for (i=0;i<patches;i++)
     128  for (i=0; i<patches; i++)
    128129  {
    129130    pats[i].patch_data=NULL;
    … …  
    133134      im->clear();
    134135      jmorph::show_step_frame(im,0,0,i,fli,pal);
    135       for (j=0;j<4;j++)
    136       {
    137     for (y=0;y<h;y++)
    138           for (sl=im->scan_line(y),x=0;x<w;x++,sl++)
    139       {   
     136      for (j=0; j<4; j++)
     137      {
     138    for (y=0; y<h; y++)
     139          for (sl=im->scan_line(y),x=0; x<w; x++,sl++)
     140      {
    140141        mark_color=-1;
    141    
    142         tot=r=g=b=0;         
     142
     143        tot=r=g=b=0;
    143144        if (x!=0 && *(sl-1))
    144145        { tot++;
    145146          r+=pal->red(*(sl-1));
    146147          g+=pal->green(*(sl-1));
    147           b+=pal->blue(*(sl-1));       
    148         }   
     148          b+=pal->blue(*(sl-1));
     149        }
    149150        if (x!=w-1 && *(sl+1))
    150151        { tot++;
    151152          r+=pal->red(*(sl+1));
    152153          g+=pal->green(*(sl+1));
    153           b+=pal->blue(*(sl+1));   
    154         }   
     154          b+=pal->blue(*(sl+1));
     155        }
    155156        if (y!=0 && im->pixel(x,y-1))
    156157        { tot++;
    … …  
    166167        }
    167168
    168         if (*sl && tot==0)  // kill any separate pixels   
     169        if (*sl && tot==0)  // kill any separate pixels
    169170          mark_color=0;
    170171        else if (*sl)
    … …  
    174175          g/=tot;
    175176          b/=tot;
    176    
     177
    177178          dist=((int)ored-r)*((int)ored-r)+((int)og-g)*((int)og-g)+((int)ob-b)*((int)ob-b);
    178179          if (i>0 && i<patches-1 && dist>3000)
    179180          {
    180181//        printf("adding blur at %d %d to frame %d, dist=%d\n",x,y,i,dist);
    181         mark_color=fli->lookup_color(r>>3,g>>3,b>>3);   
     182        mark_color=fli->lookup_color(r>>3,g>>3,b>>3);
    182183          }
    183184        }
    184         else if (*sl==0 && tot>=3)   
    185           mark_color=fli->lookup_color((r/tot)>>3,(g/tot)>>3,(b/tot)>>3);   
     185        else if (*sl==0 && tot>=3)
     186          mark_color=fli->lookup_color((r/tot)>>3,(g/tot)>>3,(b/tot)>>3);
    186187        if (mark_color>=0)
    187         {   
     188        {
    188189          pats[i].patches++;
    189190          pats[i].patch_data=(unsigned char *)realloc(pats[i].patch_data,3*pats[i].patches);
    190           cur_patch=pats[i].patch_data+  (pats[i].patches-1)*3;   
     191          cur_patch=pats[i].patch_data+  (pats[i].patches-1)*3;
    191192          *(cur_patch++)=x;
    192193          *(cur_patch++)=y;
    193           *sl=mark_color;   
    194           *(cur_patch++)=*sl;   
    195         }   
     194          *sl=mark_color;
     195          *(cur_patch++)=*sl;
     196        }
    196197      }
    197198      }
    … …  
    214215  {
    215216    morph_point8 *p_on=(morph_point8 *)p;
    216     for (i=0;i<total;i++,p_on++)
     217    for (i=0; i<total; i++,p_on++)
    217218    {
    218219      pixelx=(long)((int)p_on->x2-(int)p_on->x1)*(long)frame_on/8+p_on->x1+x;
    … …  
    232233  {
    233234    morph_point16 *p_on=(morph_point16 *)p;
    234     for (i=0;i<total;i++,p_on++)
     235    for (i=0; i<total; i++,p_on++)
    235236    {
    236237      pixelx=(long)((int)p_on->x2-(int)p_on->x1)*(long)frame_on/8+p_on->x1+x;
    … …  
    266267  end_map=(unsigned char *)malloc(w*h);
    267268
    268   for (frame_on=2;frame_on<frames-1;frame_on++)
     269  for (frame_on=2; frame_on<frames-1; frame_on++)
    269270  {
    270271    memset(middle_map,0,w*h*sizeof(morph_point8 *));            // initialize them middle pointers NULL
    … …  
    272273
    273274    morph_point8 *p_on=(morph_point8 *)p;    // p is the array of morph points
    274     for (i=0;i<total;i++,p_on++)
     275    for (i=0; i<total; i++,p_on++)
    275276    {
    276277      pixelx=(long)((int)p_on->x2-(int)p_on->x1)*(long) frame_on  /(long) frames  +p_on->x1;
    … …  
    284285    int skipped=0;
    285286
    286     for (pixely=0;pixely<h;pixely++)
    287     {
    288       for (pixelx=0;pixelx<w;pixelx++)
     287    for (pixely=0; pixely<h; pixely++)
     288    {
     289      for (pixelx=0; pixelx<w; pixelx++)
    289290      {
    290291    if (middle_map[pixelx+pixely*w]==NULL)  // we are checking for 'duds'  (misplaced black pixels)
    291     {   
    292       int tot;   
     292    {
     293      int tot;
    293294      if (pixelx>0) if (middle_map[pixelx-1+pixely*w]) tot=1; else tot=0;
    294       if (pixelx<w-1) if (middle_map[pixelx+1+pixely*w]) tot++;   
    295       if (pixely>0) if (middle_map[pixelx+(pixely-1)*w]) tot++;   
    296       if (pixely<h-1) if (middle_map[pixelx+(pixely+1)*w]) tot++;   
    297 
    298       if (tot>=3)                   // it is surronded by 3 non black squares, this is a dud   
    299       {
    300         int distance,shortest_distance,shortest_end_x,shortest_end_y;   
     295      if (pixelx<w-1) if (middle_map[pixelx+1+pixely*w]) tot++;
     296      if (pixely>0) if (middle_map[pixelx+(pixely-1)*w]) tot++;
     297      if (pixely<h-1) if (middle_map[pixelx+(pixely+1)*w]) tot++;
     298
     299      if (tot>=3)                   // it is surronded by 3 non black squares, this is a dud
     300      {
     301        int distance,shortest_distance,shortest_end_x,shortest_end_y;
    301302        morph_point8 *shortest=NULL;
    302    
    303         for (k=0;k<w;k++)
    304              for (l=0;l<h;l++)
    305           {     
     303
     304        for (k=0; k<w; k++)
     305             for (l=0; l<h; l++)
     306          {
    306307                other=middle_map[k+(l)*w];
    307308        if (other)
    308309        {
    309310          int end_x=frames*(pixelx-other->x1)/frame_on+other->x1,
    310               end_y=frames*(pixely-other->y1)/frame_on+other->y1;       
     311              end_y=frames*(pixely-other->y1)/frame_on+other->y1;
    311312          if (end_x>=0 && end_y>=0 && end_x<w && end_y<h && end_map[end_x+end_y*w])
    312313          {
    … …  
    318319              shortest=other;
    319320              shortest_end_x=end_x;
    320               shortest_end_y=end_y;       
     321              shortest_end_y=end_y;
    321322            }
    322323          }
    323324        }
    324           }   
     325          }
    325326        if (shortest)
    326327        {
    327328          total++;
    328           p=(void *)realloc(p,sizeof(morph_point8)*total);       
     329          p=(void *)realloc(p,sizeof(morph_point8)*total);
    329330          morph_point8 *mod=((morph_point8 *)p)+total-1;
    330331          mod->x1=shortest->x1;
    331332          mod->y1=shortest->y1;
    332           mod->start_color=shortest->start_color;       
     333          mod->start_color=shortest->start_color;
    333334
    334335          mod->x2=shortest_end_x;
    335           mod->y2=shortest_end_y;       
    336           mod->end_color=end_map[shortest_end_x+shortest_end_y*w];       
    337         }       
     336          mod->y2=shortest_end_y;
     337          mod->end_color=end_map[shortest_end_x+shortest_end_y*w];
     338        }
    338339        else
    339         {   
     340        {
    340341            skipped++;
    341342          printf("skiped so far : %d (frame %d)\n",skipped,frame_on);
    342343        }
    343    
    344 
    345       }   
     344
     345
     346      }
    346347    }
    347348      }
    … …  
    372373    p=(void *)malloc(sizeof(morph_point16)*total);
    373374
    374     for (i=0;i<total;i++)
     375    for (i=0; i<total; i++)
    375376    {
    376377      ((morph_point16 *)p+i)->x1=fp->read_uint16();
    … …  
    402403  {
    403404    morph_point8 *p_on=(morph_point8 *)p;
    404     for (i=0;i<total;i++,p_on++)
     405    for (i=0; i<total; i++,p_on++)
    405406    {
    406407      pixelx=(long)((int)p_on->x2-(int)p_on->x1)*(long)frame_on/(long)frames+p_on->x1+x;
    … …  
    420421  {
    421422    morph_point16 *p_on=(morph_point16 *)p;
    422     for (i=0;i<total;i++,p_on++)
     423    for (i=0; i<total; i++,p_on++)
    423424    {
    424425      pixelx=(long)((int)p_on->x2-(int)p_on->x1)*(long)frame_on/(long)frames+p_on->x1+x;
    … …  
    446447  {
    447448    morph_point8 *p_on=(morph_point8 *)p;
    448     for (i=0;i<total;i++,p_on++)
     449    for (i=0; i<total; i++,p_on++)
    449450    {
    450451      pixelx=(long)((int)p_on->x2-(int)p_on->x1)*(long)frame_on/(long)frames+p_on->x1+x;
    … …  
    452453
    453454      if (pixelx>=0 && pixely>=0 && pixelx<width && pixely<height)
    454       {   
     455      {
    455456        scolor=addr+((int)p_on->start_color)*3;
    456457        ecolor=addr+((int)p_on->end_color)*3;
    457458        pix=screen+pixelx*3+pixely*3*width;
    458         *pix=(((int)*(ecolor++))-((int)*scolor))*frame_on/frames+*scolor; scolor++; pix++;   
    459         *pix=(((int)*(ecolor++))-((int)*scolor))*frame_on/frames+*scolor; scolor++; pix++;   
     459        *pix=(((int)*(ecolor++))-((int)*scolor))*frame_on/frames+*scolor; scolor++; pix++;
     460        *pix=(((int)*(ecolor++))-((int)*scolor))*frame_on/frames+*scolor; scolor++; pix++;
    460461        *pix=((int)(*ecolor)-(int)(*scolor))*frame_on/frames+*scolor;
    461462      }
    … …  
    465466  {
    466467    morph_point16 *p_on=(morph_point16 *)p;
    467     for (i=0;i<total;i++,p_on++)
     468    for (i=0; i<total; i++,p_on++)
    468469    {
    469470      pixelx=(long)((int)p_on->x2-(int)p_on->x1)*(long)frame_on/(long)frames+p_on->x1+x;
    … …  
    471472
    472473      if (pixelx>=0 && pixely>=0 && pixelx<width && pixely<height)
    473       {   
     474      {
    474475        scolor=addr+((int)p_on->start_color)*3;
    475476        ecolor=addr+((int)p_on->end_color)*3;
    476477        pix=screen+pixelx*3+pixely*3*width;
    477         *pix=(((int)*(ecolor++))-((int)*scolor))*frame_on/frames+*scolor; scolor++; pix++;   
    478         *pix=(((int)*(ecolor++))-((int)*scolor))*frame_on/frames+*scolor; scolor++; pix++;   
     478        *pix=(((int)*(ecolor++))-((int)*scolor))*frame_on/frames+*scolor; scolor++; pix++;
     479        *pix=(((int)*(ecolor++))-((int)*scolor))*frame_on/frames+*scolor; scolor++; pix++;
    479480        *pix=((int)(*ecolor)-(int)(*scolor))*frame_on/frames+*scolor;
    480481      }
    … …  
    511512
    512513  // first found out how many hints we have to follow
    513   for (y=0;y<hint1->height();y++)
     514  for (y=0; y<hint1->height(); y++)
    514515  { sl=hint1->scan_line(y);
    515     for (x=hint1->width();x;x--,sl++)
     516    for (x=hint1->width(); x; x--,sl++)
    516517      if (*sl) hint_hist1[*sl]++;
    517518  }
    518   for (y=0;y<hint2->height();y++)
     519  for (y=0; y<hint2->height(); y++)
    519520  { sl=hint2->scan_line(y);
    520     for (x=hint2->width();x;x--,sl++)
     521    for (x=hint2->width(); x; x--,sl++)
    521522      if (*sl) hint_hist2[*sl]++;
    522523  }
    523524
    524525  // check the user and see if the mask match up
    525   for (x=0;x<256;x++)
     526  for (x=0; x<256; x++)
    526527  {
    527528    if ((hint_hist1[x]!=0 && hint_hist2[x]==0) ||
    … …  
    548549    plist=(void *)malloc(sizeof(morph_point16)*total);
    549550  CHECK(plist);
    550   for (i=0,color=0;i<total_hints;i++)
     551  for (i=0,color=0; i<total_hints; i++)
    551552  {
    552553    color++; while (!hint_hist1[color]) color++;
    … …  
    555556    total2=hint_hist2[color];
    556557    if (total1>total2) points=total1; else points=total2;
    557     for (j=0;j<points;j++)
     558    for (j=0; j<points; j++)
    558559    {
    559560      if (total1)  // are there any more pixels left in this image?
    … …  
    620621
    621622  int sx2,sy2,sec;
    622   for (i=0;i<aneal_steps;i++)
    623   {
    624     for (j=0,first_point=0;j<total_hints;j++)
     623  for (i=0; i<aneal_steps; i++)
     624  {
     625    for (j=0,first_point=0; j<total_hints; j++)
    625626    {
    626627      if (small)
    … …  
    630631      start=crange[hint_color].start;
    631632      range=crange[hint_color].end-start+1;
    632       for(k=crange[hint_color].start;k<=crange[hint_color].end;k++)
     633      for(k=crange[hint_color].start; k<=crange[hint_color].end; k++)
    633634      {
    634635        swap_point=rand()%range+start;
    … …  
    709710  else
    710711  {
    711     for (i=0;i<total;i++)
     712    for (i=0; i<total; i++)
    712713    { fp->write_uint16(((morph_point16 *)p+i)->x1);
    713714      fp->write_uint16(((morph_point16 *)p+i)->y1);
    … …  
    752753      {
    753754    morph_point8 *m8=mor->small_points();
    754    
    755     for (i=0;i<total;i++,m8++)
    756     {         
     755
     756    for (i=0; i<total; i++,m8++)
     757    {
    757758      x1=(int)m8->x1;
    758759      x2=(int)m8->x2;
    … …  
    764765      points[i].y=y1<<8;
    765766      points[i].dx=(x2-x1)<<5;
    766       points[i].dy=(y2-y1)<<5;       
     767      points[i].dy=(y2-y1)<<5;
    767768
    768769      unsigned char r1,g1,b1,r2,g2,b2;
    … …  
    775776      points[i].dr=(long)((int)r2-(int)r1)<<5;
    776777      points[i].dg=(long)((int)g2-(int)g1)<<5;
    777       points[i].db=(long)((int)b2-(int)b1)<<5;           
     778      points[i].db=(long)((int)b2-(int)b1)<<5;
    778779    }
    779780      }
    … …  
    781782      {
    782783    morph_point8 *m8=mor->small_points();
    783     for (i=0;i<total;i++,m8++)
    784     {         
     784    for (i=0; i<total; i++,m8++)
     785    {
    785786      x1=(int)m8->x1;
    786787      x2=(int)m8->x2;
    … …  
    792793      points[i].y=y2<<8;
    793794      points[i].dx=(x1-x2)<<5;
    794       points[i].dy=(y1-y2)<<5;       
     795      points[i].dy=(y1-y2)<<5;
    795796
    796797      unsigned char r1,g1,b1,r2,g2,b2;
    … …  
    803804      points[i].dr=(long)((int)r2-(int)r1)<<5;
    804805      points[i].dg=(long)((int)g2-(int)g1)<<5;
    805       points[i].db=(long)((int)b2-(int)b1)<<5;           
     806      points[i].db=(long)((int)b2-(int)b1)<<5;
    806807    }
    807808      }
    … …  
    825826  if (face_dir>0)
    826827  {
    827     for (i=0,ss=points;i<total;i++,ss++)
     828    for (i=0,ss=points; i<total; i++,ss++)
    828829    {
    829830      px=x+(ss->x>>(16-8));
    … …  
    839840    }
    840841
    841     for (j=0;j<tp;j++,sl++)
     842    for (j=0; j<tp; j++,sl++)
    842843    {
    843844      px=x+*(sl++);
    … …  
    848849  } else
    849850  {
    850     for (i=0,ss=points;i<total;i++,ss++)
     851    for (i=0,ss=points; i<total; i++,ss++)
    851852    {
    852853      px=x+ww-(ss->x>>(16-8));
    … …  
    862863    }
    863864
    864     for (j=0;j<tp;j++,sl++)
     865    for (j=0; j<tp; j++,sl++)
    865866    {
    866867      px=x+(ww-(int)(*(sl++)));
    … …  
    879880  step_struct *s=points;
    880881  int i;
    881   for (i=0;i<total;i++,s++)
     882  for (i=0; i<total; i++,s++)
    882883  {
    883884    s->dx=-s->dx;
    … …  
    899900  pats=(morph_patch *)malloc(sizeof(morph_patch)*patches);
    900901
    901   for (i=0;i<patches;i++)
     902  for (i=0; i<patches; i++)
    902903  {
    903904    pats[i].patches=fp->read_uint16();

  • abuse/trunk/src/imlib/morph.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/mouse.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/palette.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    5657   unsigned char *cl=(unsigned char *)addr();
    5758   int c=0,d=0x100000,i,nd;
    58    for (i=0;i<256;i++)
     59   for (i=0; i<256; i++)
    5960   {
    6061     nd=((int)r-(int)(*cl))*((int)r-(int)(*cl)); cl++;
    … …  
    7273   unsigned char *cl=(unsigned char *)addr()+3;
    7374   int c=1,d=0x7fffffff,i,nd;
    74    for (i=1;i<256;i++)
     75   for (i=1; i<256; i++)
    7576   {
    7677     nd=((int)r-(int)(*cl))*((int)r-(int)(*cl)); cl++;
    … …  
    8788{
    8889  int i,ub,mask,find;
    89   for (i=0,ub=0,mask=128,find=-1;i<ncolors && find<0;i++)
     90  for (i=0,ub=0,mask=128,find=-1; i<ncolors && find<0; i++)
    9091  {
    9192    if (usd[ub]&mask)
    … …  
    114115  unsigned char r,g,b,gr;
    115116
    116   for (i=0;i<256;i++)
     117  for (i=0; i<256; i++)
    117118  {
    118119    get(i,r,g,b);
    … …  
    126127  int i,c;
    127128  set(0,0,0,0);
    128   for (i=1;i<ncolors;i++)
     129  for (i=1; i<ncolors; i++)
    129130  { c=(int)((double)i/(double)ncolors*(double)255);
    130131    set(i,c,c,c);
    … …  
    136137  int i,v;
    137138  CHECK(ncolors==256);
    138   for (i=0;i<64;i++)
     139  for (i=0; i<64; i++)
    139140  {
    140141    if (i==0) v=0;
    … …  
    156157{
    157158  int i;
    158   for (i=0;i<ncolors;i++) set_used(i);
     159  for (i=0; i<ncolors; i++) set_used(i);
    159160}
    160161
    … …  
    162163{
    163164  int i;
    164   for (i=0;i<ncolors;i++) set_unused(i);
     165  for (i=0; i<ncolors; i++) set_unused(i);
    165166}
    166167
    … …  
    171172  int i;
    172173  p=new palette(ncolors);
    173   for (i=0;i<ncolors;i++)
     174  for (i=0; i<ncolors; i++)
    174175  {
    175176    if (used(i))
    … …  
    213214  if (!closest_only)
    214215  {
    215     for (i=ncolors-1,f=-1,u=-1;i>=0 && f<0;i--)
     216    for (i=ncolors-1,f=-1,u=-1; i>=0 && f<0; i--)
    216217    {
    217218      if (used(i))
    … …  
    235236    else
    236237    {
    237       for (i=0,f=0,u=10000;i<ncolors;i++)
     238      for (i=0,f=0,u=10000; i<ncolors; i++)
    238239      { c=(pal[i].red-r)*(pal[i].red-r)+
    239240      (pal[i].green-g)*(pal[i].green-g)+
    … …  
    254255  set(0,0,0,0);
    255256  set_used(0);
    256   for (i=1;i<ncolors;i++)
     257  for (i=1; i<ncolors; i++)
    257258    set_unused(i);
    258259  if (ncolors==256)
    259     for (i=0;i<ncolors;i++)
     260    for (i=0; i<ncolors; i++)
    260261      set(i,RED3(i),GREEN3(i),BLUE2(i));
    261262  else if (ncolors==16)
    262     for (i=0;i<ncolors;i++)
     263    for (i=0; i<ncolors; i++)
    263264      set(i,255-(i&3),255-((i&4)>>2),255-((i&8)>>3));
    264265  else
    265     for (i=0;i<ncolors;i++)
     266    for (i=0; i<ncolors; i++)
    266267      set(i,255-(i%3),255-((i+1)%3),255-((i+2)%3));
    267268}
    … …  
    275276
    276277    m=-amount;
    277     for (i=0;i<ncolors*3;i++)
     278    for (i=0; i<ncolors*3; i++)
    278279      ((unsigned char *) pal)[i]>>=m;
    279280  }
    … …  
    281282  {
    282283    m=amount;
    283     for (i=0;i<ncolors*3;i++)
     284    for (i=0; i<ncolors*3; i++)
    284285      ((unsigned char *) pal)[i]<<=m;
    285286  }
    … …  
    319320{
    320321/*  if (!is_leaf())
    321   { for (i=0;i<8;i++)
     322  { for (i=0; i<8; i++)
    322323      if (children[i])
    323324      {    delete children[i];
    … …  
    349350  }
    350351  else
    351   { for (i=0;i<8;i++)
     352  { for (i=0; i<8; i++)
    352353      if (children[i])
    353354    children[i]->total(tnodes,tr,tg,tb);
    … …  
    363364    be_childish();
    364365  else
    365     for (i=0;i<8;i++) children[i]=NULL;
     366    for (i=0; i<8; i++) children[i]=NULL;
    366367  padre=dad;
    367368  red=r; green=g; blue=b;
    … …  
    377378  {
    378379    if (!who->is_leaf())
    379     { for (x=0;x<8;x++)
     380    { for (x=0; x<8; x++)
    380381    if (who->children[x])
    381382    {
    … …  
    393394  int pruned,lev,x,r,g,b,t;
    394395  quant_node *p=NULL,*f=NULL;
    395   for (pruned=0,lev=8;lev>1 && !pruned;lev--)
     396  for (pruned=0,lev=8; lev>1 && !pruned; lev--)
    396397  {
    397398    p=(quant_node *)level[lev-1].first();
    … …  
    400401      {
    401402    f=p->father();
    402     for (x=0;x<8 && !pruned;x++)
     403    for (x=0; x<8 && !pruned; x++)
    403404      if (f->children[x])
    404405        if (f->children[x]->next()!=p->next())        // if this son is not me!
    … …  
    469470  quant_node *pn;
    470471  p=new palette(mx);
    471   for (x=0,i=7;i>=0;i++)
     472  for (x=0,i=7; i>=0; i++)
    472473    for (pn=(quant_node *)level[i].first();
    473      pn!=(quant_node *)level[i].first();pn=(quant_node *)pn->next())
     474     pn!=(quant_node *)level[i].first(); pn=(quant_node *)pn->next())
    474475      if (pn->is_leaf())
    475476    p->set(x++,pn->red,pn->green,pn->blue);
    … …  
    492493  brv=0; bri=0;
    493494
    494   for (i=0;i<(unsigned int)ncolors;i++)
     495  for (i=0; i<(unsigned int)ncolors; i++)
    495496  { if (all || used(i))
    496497    {
    … …  
    512513  brv=(long)258*(long)258*(long)258; bri=0;
    513514
    514   for (i=0;i<(unsigned int)ncolors;i++)
     515  for (i=0; i<(unsigned int)ncolors; i++)
    515516  { if (all || used(i))
    516517    {
    … …  
    536537  uint8_t x;
    537538  int i;
    538   for (i=0;i<ncolors;i++)
     539  for (i=0; i<ncolors; i++)
    539540  {
    540541    x=(( dest_r-(int)*sl)*fade_on/total_fades+*sl);

  • abuse/trunk/src/imlib/palette.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    8687  void total(int &tnodes, int &tr, int &tg, int &tb);
    8788//  void prune();
    88   void set(int r,int g,int b) {red=r; green=g; blue=b; }
     89  void set(int r,int g,int b) { red=r; green=g; blue=b; }
    8990  unsigned char red,green,blue;
    9091  ~quant_node();

  • abuse/trunk/src/imlib/pcxread.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    7778  int y,run_length,x;
    7879  unsigned char *sl,code;
    79   for (y=0;y<im->height();y++)
     80  for (y=0; y<im->height(); y++)
    8081  {
    8182    sl=im->scan_line(y);
    82     for (x=0;x<im->width();)
     83    for (x=0; x<im->width(); )
    8384    {
    8485      run_length=1;
    … …  
    9495    fputc(code,fp);
    9596    fputc(sl[x],fp);
    96    
     97
    9798      }
    9899      x+=run_length;

  • abuse/trunk/src/imlib/pcxread.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/pmenu.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    3940  int total=0,tx,tw;
    4041  pmenu_item *p=top;
    41   for (;p;p=p->next) total++;
     42  for (; p; p=p->next) total++;
    4243
    4344  tw=w/(total+1);
    4445  tx=tw/2;
    4546
    46   for (p=top;p;p=p->next,tx+=tw)
     47  for (p=top; p; p=p->next,tx+=tw)
    4748    p->draw_self(bar,itemx(p),1,itemw(p),1,p==active);
    4849/*  }
    4950  else
    5051  {
    51     for (p=top;p;p=p->next,tx+=tw)
     52    for (p=top; p; p=p->next,tx+=tw)
    5253      p->draw(bar,itemx(p),1,itemw(p),1,p==active);
    5354  }*/
    … …  
    119120pmenu_item *psub_menu::find_id(int search_id)
    120121{
    121   for (pmenu_item *f=first;f;f=f->next)
     122  for (pmenu_item *f=first; f; f=f->next)
    122123  {
    123124    pmenu_item *ret=f->find_id(search_id);
    … …  
    129130pmenu_item *psub_menu::find_key(int key)
    130131{
    131   for (pmenu_item *f=first;f;f=f->next)
     132  for (pmenu_item *f=first; f; f=f->next)
    132133  {
    133134    pmenu_item *ret=f->find_key(key);
    … …  
    165166  int tw=wm->font()->width(),th=wm->font()->height();
    166167  w=h=0;
    167   for (pmenu_item *p=first;p;p=p->next)
     168  for (pmenu_item *p=first; p; p=p->next)
    168169  {
    169170    if (p->name())
    … …  
    205206  int has_flags=0;
    206207  pmenu_item *p=first;
    207   for (;p;p=p->next) if (p->on_off) has_flags=1;
     208  for (; p; p=p->next) if (p->on_off) has_flags=1;
    208209  x=has_flags ? 3+wm->font()->width() : 3;
    209210  y=3;
    210211
    211   for (p=first;p;p=p->next,i++,y+=wm->font()->height()+1)
     212  for (p=first; p; p=p->next,i++,y+=wm->font()->height()+1)
    212213    p->draw(win,x,y,w-6,0,i==active);
    213214
    … …  
    232233      {
    233234    parent->screen->bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->dark_color());
    234     wm->font()->put_string(parent->screen,x+1,y+1,n,wm->medium_color());   
     235    wm->font()->put_string(parent->screen,x+1,y+1,n,wm->medium_color());
    235236    if (on_off && *on_off) wm->font()->put_string(parent->screen,bx+1,y+1,"*",wm->medium_color());
    236237      }
    … …  
    288289
    289290  int total=0,tw,i=0,x=0;
    290   for (pmenu_item *pp=top;pp;pp=pp->next,i++)
     291  for (pmenu_item *pp=top; pp; pp=pp->next,i++)
    291292  { if (pp==p) x=i;
    292293    total++;
    … …  
    316317
    317318  int has_flags=0,dx=3;
    318   for (pmenu_item *p=first;p;p=p->next) if (p->on_off) has_flags=1;
     319  for (pmenu_item *p=first; p; p=p->next) if (p->on_off) has_flags=1;
    319320  if (has_flags) dx+=wm->font()->width();
    320321
    … …  
    378379  else
    379380  {
    380     for (pmenu_item *p=top;p;p=p->next)
     381    for (pmenu_item *p=top; p; p=p->next)
    381382    {
    382383      if (!p->next) return p;
    … …  
    390391{
    391392  if (win && ev.window==win) return 1; else
    392     for (pmenu_item *p=first;p;p=p->next)
     393    for (pmenu_item *p=first; p; p=p->next)
    393394      if (p->own_event(ev))
    394395        return 1;
    … …  
    415416    else
    416417    {
    417       for (pmenu_item *p=top;p && !yes;p=p->next)  // event in submenu?
     418      for (pmenu_item *p=top; p && !yes; p=p->next)  // event in submenu?
    418419      if (p->own_event(ev)) yes=1;
    419420    }
    … …  
    425426    case EV_KEY :
    426427    {
    427       for (pmenu_item *p=top;p;p=p->next)
     428      for (pmenu_item *p=top; p; p=p->next)
    428429      {
    429430    pmenu_item *r=p->find_key(ev.key);

  • abuse/trunk/src/imlib/pmenu.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/readwav.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/readwav.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/scroller.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    6061
    6162  screen->lock();
    62   for (int yc=ich;yc;yc--,y++)
     63  for (int yc=ich; yc; yc--,y++)
    6364  {
    6465    if (y>=cy1 && y<=cy2)
    6566    {
    6667      uint8_t *sl=screen->scan_line(y)+x;
    67       for (int xc=icw,xo=x;xc;xc--,xo++,sl++,buf++)
     68      for (int xc=icw,xo=x; xc; xc--,xo++,sl++,buf++)
    6869      {
    6970    if (xo>=cx1 && xo<=cx2)
    … …  
    183184    {
    184185      if (ev.mouse_button && drag==-1)
    185       {   
     186      {
    186187    if (mx>=b1x() && mx<b1x()+bw() && my>=b1y()-2 && my<b1y()+bh())
    187188    {
    … …  
    201202        draw_widget(screen,0);
    202203        scroll_event(sx,screen);
    203       }   
     204      }
    204205    }
    205206    else
    … …  
    215216          drag=sx;
    216217          inm->grab_focus(this);
    217         }   
     218        }
    218219        else if (t>1)
    219220        {
    … …  
    224225        sx=nx;
    225226        draw_widget(screen,0);
    226         scroll_event(sx,screen);       
    227           }       
     227        scroll_event(sx,screen);
     228          }
    228229        }
    229230      } else handle_inside_event(ev,screen,inm);
    … …  
    286287    sx++;
    287288    draw_widget(screen,0);
    288     scroll_event(sx,screen);   
     289    scroll_event(sx,screen);
    289290  }
    290291}
    … …  
    297298    sx--;
    298299    draw_widget(screen,0);
    299     scroll_event(sx,screen);   
     300    scroll_event(sx,screen);
    300301  }
    301302}
    … …  
    308309    sx--;
    309310    draw_widget(screen,0);
    310     scroll_event(sx,screen);   
     311    scroll_event(sx,screen);
    311312  }
    312313}
    … …  
    319320    sx++;
    320321    draw_widget(screen,0);
    321     scroll_event(sx,screen);   
     322    scroll_event(sx,screen);
    322323  }
    323324}
    … …  
    332333    sx=x;
    333334    draw_widget(screen,0);
    334     scroll_event(sx,screen);   
     335    scroll_event(sx,screen);
    335336  }
    336337}
    … …  
    363364  int xa,ya,xo=0,yo;
    364365  if (vert) { xa=0; ya=30; yo=x+5; yo=y+5; } else { xa=30; ya=0; xo=x+5; yo=y+5; }
    365   for (int i=newx,c=0;c<30 && i<100;i++,c++)
     366  for (int i=newx,c=0; c<30 && i<100; i++,c++)
    366367  {
    367368    char st[10];
    … …  
    396397  lis=(pick_list_item *)malloc(sizeof(pick_list_item)*num_entries);
    397398  int i=0;
    398   for (;i<num_entries;i++)
     399  for (; i<num_entries; i++)
    399400  {
    400401    lis[i].name=List[i];
    … …  
    403404  qsort((void *)lis,num_entries,sizeof(pick_list_item),lis_sort);
    404405
    405   for (i=0;i<t;i++)
     406  for (i=0; i<t; i++)
    406407    if ((int)strlen(List[i])>wid)
    407408      wid=strlen(List[i]);
    … …  
    441442      key_hist[(int)(key_hist_total++)]=ev.key;
    442443
    443     for (int i=0;i<t && found==-1;i++)
     444    for (int i=0; i<t && found==-1; i++)
    444445    {
    445446      if ((int)strlen(lis[i].name)>=key_hist_total && memcmp(lis[i].name,key_hist,key_hist_total)==0)
    … …  
    466467    draw_widget(screen,0);
    467468  }
    468   scroll_event(sx,screen);   
     469  scroll_event(sx,screen);
    469470}
    470471
    … …  
    480481    draw_widget(screen,0);
    481482  }
    482   scroll_event(sx,screen);   
     483  scroll_event(sx,screen);
    483484}
    484485
    … …  
    494495    int th=(h+tex->height()-1)/tex->height();
    495496    int dy=y;
    496     for (int j=0;j<th;j++,dy+=tex->height())
    497       for (int i=0,dx=x;i<tw;i++,dx+=tex->width())
     497    for (int j=0; j<th; j++,dy+=tex->height())
     498      for (int i=0,dx=x; i<tw; i++,dx+=tex->width())
    498499        tex->put_image(screen,dx,dy);
    499500
    … …  
    502503
    503504  int dy=y;
    504   for (int i=0;i<th;i++,dy+=wm->font()->height()+1)
     505  for (int i=0; i<th; i++,dy+=wm->font()->height()+1)
    505506  {
    506507    if (i+newx==cur_sel)
    … …  
    548549  if (m)
    549550  {
    550     for (int i=0;i<t;i++)
     551    for (int i=0; i<t; i++)
    551552      if (get_select(i)) return i;
    552553    return -1;
    … …  
    609610  draw_background(screen);
    610611
    611   for (int i=newx;i<newx+vis();i++)
     612  for (int i=newx; i<newx+vis(); i++)
    612613  {
    613614    if (i<t)
    … …  
    657658      {
    658659    if (m)
    659     {   
     660    {
    660661      if (ev.mouse_button)
    661662      {
    … …  
    670671    } else if (ok_to_select(me))
    671672    {
    672       if (cur_sel==me)   
     673      if (cur_sel==me)
    673674        note_selection(screen,inm,me);
    674675      else

  • abuse/trunk/src/imlib/scroller.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    4546
    4647  virtual int activate_on_mouse_move() { return 1; }
    47   virtual void handle_inside_event(event &ev, image *screen, InputManager *inm) {;}
     48  virtual void handle_inside_event(event &ev, image *screen, InputManager *inm) { ; }
    4849  virtual void scroll_event(int newx, image *screen);
    4950  virtual void handle_up(image *screen, InputManager *inm);

  • abuse/trunk/src/imlib/specs.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    7677        free( spec_prefix );
    7778    }
    78    
     79
    7980    if( prefix )
    8081    {
    … …  
    396397{
    397398  int wr=0;
    398   for (char const *s=mode;*s;s++)
     399  for (char const *s=mode; *s; s++)
    399400    if (toupper(*s)=='A' || toupper(*s)=='W')
    400401      wr=1;
    … …  
    428429 flags=access=0;
    429430 char const *s=access_string;
    430   for (;*s;s++)
     431  for (; *s; s++)
    431432    if (toupper(*s)=='R') access=O_RDONLY;
    432433
    433   for (s=access_string;*s;s++)
     434  for (s=access_string; *s; s++)
    434435    if (toupper(*s)=='W')
    435436    {
    … …  
    439440    }
    440441
    441   for (s=access_string;*s;s++)
     442  for (s=access_string; *s; s++)
    442443    if (toupper(*s)=='A')
    443444      access|=O_APPEND|O_WRONLY;
    … …  
    489490            if (current_offset+start_offset != spec_main_offset)
    490491                spec_main_offset = lseek(fd, start_offset+current_offset, SEEK_SET);
    491            
     492
    492493            len = ::read(fd,(char*)buf,count);
    493494            break;
    … …  
    495496            if (current_offset+start_offset != spec_main_offset)
    496497                spec_main_offset = lseek(fd, start_offset+current_offset, SEEK_SET);
    497            
     498
    498499            len = ::read(fd,(char*)buf,count);
    499500            ::write(fast_load_fd,(char*)&len,sizeof(len));
    … …  
    505506            break;
    506507        }
    507        
     508
    508509        spec_main_offset += len;
    509510    }
    … …  
    663664  if (total)
    664665  {
    665     for (i=0,e=entries;i<total;i++,e++)          // calculate the size of directory info
     666    for (i=0,e=entries; i<total; i++,e++)          // calculate the size of directory info
    666667    {
    667668      o+=1+1+strlen((*e)->name)+1 +1 +8;
    668669    }
    669670
    670     for (i=0,e=entries;i<total;i++,e++)          // calculate offset for each entry
     671    for (i=0,e=entries; i<total; i++,e++)          // calculate offset for each entry
    671672    {
    672673      (*e)->offset=o;
    … …  
    680681  int i;
    681682  spec_entry **e;
    682   for (i=0,e=entries;i<total;i++,e++)
     683  for (i=0,e=entries; i<total; i++,e++)
    683684    if (!strcmp((*e)->name,name) && (*e)->type==type)
    684685      return (*e);
    … …  
    690691  int i;
    691692  spec_entry **e;
    692   for (i=0,e=entries;i<total;i++,e++)
     693  for (i=0,e=entries; i<total; i++,e++)
    693694    if (!strcmp((*e)->name,name))
    694695      return (*e);
    … …  
    700701  int i;
    701702  spec_entry **e;
    702   for (i=0,e=entries;i<total;i++,e++)
     703  for (i=0,e=entries; i<total; i++,e++)
    703704    if (!strcmp((*e)->name,name))
    704705      return i;
    … …  
    710711  int i;
    711712  spec_entry **e;
    712   for (i=0,e=entries;i<total;i++,e++)
     713  for (i=0,e=entries; i<total; i++,e++)
    713714    if ((*e)->type==type)
    714715      return (*e);
    … …  
    720721  int i,x=0;
    721722  spec_entry **e;
    722   for (i=0,e=entries;i<total;i++,e++)
     723  for (i=0,e=entries; i<total; i++,e++)
    723724    if ((*e)->type==type) x++;
    724725  return x;
    … …  
    729730  int i;
    730731  spec_entry **e;
    731   for (i=0,e=entries;i<total;i++,e++)
     732  for (i=0,e=entries; i<total; i++,e++)
    732733    if ((*e)->type==type)
    733734      return i;
    … …  
    740741  int i;
    741742  printf("[   Entry type   ][   Entry name   ][  Size  ][ Offset ]\n");
    742   for (i=0,se=entries;i<total;i++,se++)
     743  for (i=0,se=entries; i<total; i++,se++)
    743744    (*se)->print();
    744745}
    … …  
    759760
    760761    int i;
    761     for (i=0;i<total;i++)
     762    for (i=0; i<total; i++)
    762763    {
    763764      fp->read(buf,2);
    … …  
    772773    char *dp=(char *)data;
    773774    fp->seek(start,SEEK_SET);
    774     for (i=0;i<total;i++)
     775    for (i=0; i<total; i++)
    775776    {
    776777      spec_entry *se=(spec_entry *)dp;
    … …  
    858859  spec_entry **e;
    859860  long i;
    860   for (i=total-1,e=entries;i>=0;i--,e++)
     861  for (i=total-1,e=entries; i>=0; i--,e++)
    861862    return (*e)->offset+(*e)->size;
    862863
    … …  
    878879
    879880  int i;
    880   for (i=0,e=entries;i<total;i++,e++)
     881  for (i=0,e=entries; i<total; i++,e++)
    881882  {
    882883    if (fp->write(&(*e)->type,1)!=1)                 return 0;
    … …  
    965966{
    966967  int i;
    967   for (i=0;i<total && entries[i]!=e;i++);            // find the entry in the array first
     968  for (i=0; i<total && entries[i]!=e; i++);            // find the entry in the array first
    968969
    969970  if (entries[i]==e)                                 // make sre it was found
    … …  
    971972    delete e;
    972973    total--;
    973     for (;i<total;i++)                               // compact the pointer array
     974    for (; i<total; i++)                               // compact the pointer array
    974975      entries[i]=entries[i+1];
    975976    entries=(spec_entry **)realloc(entries,sizeof(spec_entry *)*total);
    … …  
    991992{
    992993  int i;
    993   for (i=0;i<total;i++)
     994  for (i=0; i<total; i++)
    994995    delete entries[i];
    995996

  • abuse/trunk/src/imlib/specs.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    177178  void *data;
    178179  long size;
    179 //  spec_directory(char *filename);  ;; not allowed anymore, user must construct file first!
     180//  spec_directory(char *filename);  ; ; not allowed anymore, user must construct file first!
    180181  spec_directory(FILE *fp);
    181182  spec_directory(bFILE *fp);
    … …  
    203204                         char *data_name,
    204205                         unsigned long data_size,
    205                          char *link_filename=NULL);*/
     206                         char *link_filename=NULL); */
    206207
    207208uint16_t read_uint16(FILE *fp);

  • abuse/trunk/src/imlib/sprite.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    4950
    5051void sprite_controller::remove_sprites()
    51 { sprite *sp; loopt(sprite,sp,sprites.first(),sp->restore_background();); }
     52{ sprite *sp; loopt(sprite,sp,sprites.first(),sp->restore_background(); ); }
    5253
    5354void sprite_controller::put_sprites()
    54 { sprite *sp; loopt(sprite,sp,sprites.first(),sp->draw();); }
     55{ sprite *sp; loopt(sprite,sp,sprites.first(),sp->draw(); ); }
    5556
    5657void sprite_controller::get_backgrounds()
    57 { sprite *sp; loopt(sprite,sp,sprites.first(),sp->get_background();); }
     58{ sprite *sp; loopt(sprite,sp,sprites.first(),sp->get_background(); ); }
    5859
    5960void sprite::change_visual(image *Visual, int delete_old)

  • abuse/trunk/src/imlib/sprite.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/status.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    5960    int t=percentage*40/100;
    6061    int i=0;
    61     for (;i<t;i++)
     62    for (; i<t; i++)
    6263      s[len+i] = '.';
    63     for (;i<40;i++)
     64    for (; i<40; i++)
    6465        s[len+i] = ' ';
    6566    s[len+i++] = ']';

  • abuse/trunk/src/imlib/status.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    2122  virtual void pop() = 0;
    2223  virtual void force_display() { ; }
    23   virtual ~status_manager() {}
     24  virtual ~status_manager() { }
    2425} ;
    2526

  • abuse/trunk/src/imlib/supmorph.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    3940
    4041  dp=hint1->t_data();
    41   for (y=0;y<h1;y++)
     42  for (y=0; y<h1; y++)
    4243  {
    4344    x=0;
    … …  
    5657  // hint2 image2
    5758  dp=hint2->t_data();
    58   for (y=0;y<h2;y++)
     59  for (y=0; y<h2; y++)
    5960  {
    6061    x=0;
    … …  
    7879  unsigned char hint_color[256],total_hints=0;
    7980
    80   for (y=0;y<256;y++,h1p++,h2p++)
     81  for (y=0; y<256; y++,h1p++,h2p++)
    8182    if (*h1p)
    8283    {
    … …  
    100101  /**************** Now scan the images again setup hints *********************/
    101102  dp=hint1->t_data();
    102   for (y=0;y<h1;y++)
     103  for (y=0; y<h1; y++)
    103104  {
    104105    x=0;
    … …  
    122123
    123124  dp=hint2->t_data();
    124   for (y=0;y<h2;y++)
     125  for (y=0; y<h2; y++)
    125126  {
    126127    x=0;
    … …  
    144145
    145146  /********* if hint sizes don't match duplicate the smaller until sizes are equal **********/
    146   for (start=0,x=0;x<total_hints;x++)
     147  for (start=0,x=0; x<total_hints; x++)
    147148  {
    148149    y=hint_color[x];
    149150    int dups;
    150     for (dp=movers+start1[y]*4,dups=totals[y]-hints1[y];dups;dups--)
     151    for (dp=movers+start1[y]*4,dups=totals[y]-hints1[y]; dups; dups--)
    151152    {
    152153      *dp=*(dp-4); dp++;      // copy previous x,y position
    153154      *dp=*(dp-4); dp++;
    154       dp+=2;   
     155      dp+=2;
    155156    }
    156157    start1[y]-=2*totals[y]-hints1[y];        // set the start back to the begining of hint range
    157158  }
    158159
    159   for (start=0,x=0;x<total_hints;x++)
     160  for (start=0,x=0; x<total_hints; x++)
    160161  {
    161162    y=hint_color[x];
    162163    int dups;
    163     for (dp=movers+start2[y]*4+2,dups=totals[y]-hints2[y];dups;dups--)
     164    for (dp=movers+start2[y]*4+2,dups=totals[y]-hints2[y]; dups; dups--)
    164165    {
    165166      *dp=*(dp-4); dp++;      // copy previous x,y position
    166167      *dp=*(dp-4); dp++;
    167       dp+=2;   
     168      dp+=2;
    168169    }
    169170    start2[y]-=hints2[y];        // set the start back to the begining of hint range
    … …  
    173174  /******* Now apply simulated annealing to solve for a smaller total distance ********/
    174175  int rand_on=0;
    175   for (y=0;y<aneal_steps;y++)
     176  for (y=0; y<aneal_steps; y++)
    176177  {
    177178    if (stat_fun)
    178179      stat_fun(y);
    179180    dp=movers;
    180     for (x=0;x<total_hints;x++)
     181    for (x=0; x<total_hints; x++)
    181182    {
    182183      int hc=hint_color[x];
    183184      int a,z=totals[hc];
    184185      unsigned char *range_start=dp;
    185       for (a=0;a<z;a++,dp+=4)
     186      for (a=0; a<z; a++,dp+=4)
    186187      {
    187188    unsigned char *swap=range_start+(rtable[((rand_on++)&(RAND_TABLE_SIZE-1))]%z)*4;
    … …  
    210211  w=m->w; h=m->h;
    211212
    212   for (i=0;i<t;i++,p++)
     213  for (i=0; i<t; i++,p++)
    213214  {
    214215    x1=*(d++);
    … …  
    266267    memset(hole,0,w*h);
    267268    unsigned char *paddr=(unsigned char *)pal->addr();
    268     for (ss=steps,i=0;i<t;i++,ss++)
     269    for (ss=steps,i=0; i<t; i++,ss++)
    269270    {
    270271      ix=(ss->x>>(16));
    … …  
    289290
    290291    unsigned char *ll=hole+1,*tl=hole+w+1,*nl=hole+w*2+1;
    291     for (iy=1;iy<h-1;iy++)    // now scan the for holes to fill
    292     {
    293       for (ix=1;ix<w-1;ix++,ll++,tl++,nl++)
     292    for (iy=1; iy<h-1; iy++)    // now scan the for holes to fill
     293    {
     294      for (ix=1; ix<w-1; ix++,ll++,tl++,nl++)
    294295      {
    295296    if (x+ix>=x1 && x+ix<=x2 && y+iy>=y1 && y+iy<=y2)
    … …  
    301302      if (*(tl+1)) t++;
    302303      if (*ll) t++;
    303       if (*nl) t++;*/
     304      if (*nl) t++; */
    304305
    305306      if (*(tl-1)) { t++; pa=paddr+(*(tl-1))*3; r+=*(pa++); g+=*(pa++); b+=*(pa++); }
    306307      if (*(tl+1)) { t++; pa=paddr+(*(tl+1))*3; r+=*(pa++); g+=*(pa++); b+=*(pa++); }
    307308      if (*(ll)) { t++; pa=paddr+(*ll)*3; r+=*(pa++); g+=*(pa++); b+=*(pa++); }
    308       if (*(nl)) { t++; pa=paddr+(*nl)*3; r+=*(pa++); g+=*(pa++); b+=*(pa++); }   
     309      if (*(nl)) { t++; pa=paddr+(*nl)*3; r+=*(pa++); g+=*(pa++); b+=*(pa++); }
    309310
    310311      if (*tl)

  • abuse/trunk/src/imlib/supmorph.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/system.h

    r97 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    2122   ((( ((uint32_t)(x)) )&0x0000ff00)<<8)|(( ((uint32_t)(x)) )<<24))
    2223
    23 #if SDL_BYTEORDER == SDL_BIG_ENDIAN 
     24#if SDL_BYTEORDER == SDL_BIG_ENDIAN
    2425#define LONG int32_t
    2526#define uint16_to_intel(x) uint16_swap(x)

  • abuse/trunk/src/imlib/timage.cpp

    r490 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    1617  uint8_t *dp=data;
    1718  int y,x;
    18   for (y=0;y<h;y++)
     19  for (y=0; y<h; y++)
    1920  {
    2021    x=0;
    … …  
    4041  uint8_t *d=im->scan_line(0),*dp=data,*dline;
    4142  int y,x;
    42   for (y=0;y<h;y++)
     43  for (y=0; y<h; y++)
    4344  {
    4445    x=0;
    … …  
    7576
    7677  // first we must find out how much data to allocate
    77   for (y=0;y<im->height();y++)
     78  for (y=0; y<im->height(); y++)
    7879  {
    7980    sl=im->scan_line(y);
    … …  
    104105  CONDITION(datap,"malloc error for trans_image::data");
    105106
    106   for (y=0;y<hh;y++)  // now actually make the runs
     107  for (y=0; y<hh; y++)  // now actually make the runs
    107108  {
    108109    sl=im->scan_line(y);
    … …  
    145146  while (line)            // skip scan line data until we get to the line of interest
    146147  {
    147     for (ix=0;ix<w;)
     148    for (ix=0; ix<w; )
    148149    {
    149150      ix+=*datap;        // skip blank space
    … …  
    165166  uint8_t *screen_line=screen->scan_line(y)+x;
    166167
    167   for (ix=0;ix<w;)
     168  for (ix=0; ix<w; )
    168169  {
    169170    int skip=*datap;              // how much space to skip?
    … …  
    275276  int sw=screen->width()-w;
    276277  x1-=x; x2-=x;
    277   for (;ysteps>0;ysteps--)
     278  for (; ysteps>0; ysteps--)
    278279  {
    279280    int ix,slam_length;
    280     for (ix=0;ix<w;)
     281    for (ix=0; ix<w; )
    281282    {
    282283      int blank=(*datap);
    … …  
    343344  screen->lock();
    344345  screen_skip = screen->width() - w;
    345   for (;ysteps;ysteps--)
    346   {
    347     for (ix=0;ix<w;)
     346  for (; ysteps; ysteps--)
     347  {
     348    for (ix=0; ix<w; )
    348349    {
    349350      skip=*datap;       // skip leading blank space
    … …  
    387388  int sw=screen->width();
    388389  x1-=x; x2-=x;
    389   for (;ysteps>0;ysteps--)
     390  for (; ysteps>0; ysteps--)
    390391  {
    391392    int ix,slam_length;
    392     for (ix=0;ix<w;)
     393    for (ix=0; ix<w; )
    393394    {
    394395      ix+=(*datap);       // skip over empty space
    … …  
    452453  int sw=screen->width();
    453454  x1-=x; x2-=x;
    454   for (;ysteps>0;ysteps--)
     455  for (; ysteps>0; ysteps--)
    455456  {
    456457    int ix,slam_length;
    457     for (ix=0;ix<w;)
     458    for (ix=0; ix<w; )
    458459    {
    459460      ix+=(*datap);       // skip over empty space
    … …  
    530531  int sw=screen->width();
    531532  x1-=x; x2-=x;
    532   for (;ysteps>0;ysteps--)
     533  for (; ysteps>0; ysteps--)
    533534  {
    534535    int ix,slam_length;
    535     for (ix=0;ix<w;)
     536    for (ix=0; ix<w; )
    536537    {
    537538      ix+=(*datap);       // skip over empty space
    … …  
    612613  long fixmul=(frame_on<<16)/total_frames;
    613614  screen->lock();
    614   for (;ysteps>0;ysteps--,y++)
     615  for (; ysteps>0; ysteps--,y++)
    615616  {
    616617    screen_line=screen->scan_line(y);
    617618
    618     for (ix=0;ix<w;)
     619    for (ix=0; ix<w; )
    619620    {
    620621      ix+=(*datap);       // skip over empty space
    … …  
    706707
    707708  long fixmul=(frame_on<<16)/total_frames;
    708   for (;ysteps>0;ysteps--,y++)
     709  for (; ysteps>0; ysteps--,y++)
    709710  {
    710711    screen_line=screen->scan_line(y);
    711712
    712     for (ix=0;ix<w;)
     713    for (ix=0; ix<w; )
    713714    {
    714715      ix+=(*datap);       // skip over empty space
    … …  
    790791
    791792  screen->lock();
    792   for (;ysteps>0;ysteps--,y++)
     793  for (; ysteps>0; ysteps--,y++)
    793794  {
    794795    screen_line=screen->scan_line(y);
    795796
    796     for (ix=0;ix<w;)
     797    for (ix=0; ix<w; )
    797798    {
    798799      ix+=(*datap);       // skip over empty space
    … …  
    861862
    862863  screen->lock();
    863   for (;ysteps>0;ysteps--,y++)
     864  for (; ysteps>0; ysteps--,y++)
    864865  {
    865866    screen_line=screen->scan_line(y);
    … …  
    867868
    868869
    869     for (ix=0;ix<w;)
     870    for (ix=0; ix<w; )
    870871    {
    871872      ix+=(*datap);       // skip over empty space
    … …  
    959960  else if (y+ysteps==y2-1) ysteps--;
    960961/*  {
    961     for (int x=0;x<w;)
     962    for (int x=0; x<w; )
    962963    {
    963964      int skip=*datap; datap++;
    … …  
    980981  int sw=screen->width();
    981982  x1-=x; x2-=x;
    982   for (;ysteps>0;ysteps--)
     983  for (; ysteps>0; ysteps--)
    983984  {
    984985    int ix,slam_length;
    985     for (ix=0;ix<w;)
     986    for (ix=0; ix<w; )
    986987    {
    987988      ix+=(*datap);       // skip over empty space
    … …  
    10361037  uint8_t *d=data;
    10371038  int t=0;
    1038   for (int y=0;y<h;y++)
     1039  for (int y=0; y<h; y++)
    10391040  {
    10401041    int x=0;

  • abuse/trunk/src/imlib/timage.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/timing.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/tools.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    1718{ delete old_pal;
    1819  delete map;
    19   for (int i=0;i<total_icons;i++)
     20  for (int i=0; i<total_icons; i++)
    2021    delete icons[i];                   // delete visual object, which should be a "shell"
    2122}
    … …  
    3738  ids=Ids;
    3839  total_icons=total_ic;
    39   for (int i=0;i<total_ic;i++)
     40  for (int i=0; i<total_ic; i++)
    4041  {
    4142    if (icons[i]->width()>iw) iw=icons[i]->width();

  • abuse/trunk/src/imlib/tools.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/video.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public

  • abuse/trunk/src/imlib/visobj.cpp

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    3940    int fw=wm->font()->width(),fh=wm->font()->height(),maxw=0;
    4041    char *info=st;
    41     for (w=fw,h=fh+1;*info;info++)
     42    for (w=fw,h=fh+1; *info; info++)
    4243    {
    4344      if (w>maxw) maxw=w;

  • abuse/trunk/src/imlib/visobj.h

    r481 r494  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
     4 *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
    45 *
    56 *  This software was released into the Public Domain. As with most public
    … …  
    2021  virtual int width() = 0;
    2122  virtual int height() = 0;
    22   virtual ~visual_object() {}
     23  virtual ~visual_object() { }
    2324} ;
    2425
Note: See TracChangeset for help on using the changeset viewer.