Changeset 162Tweet

Timestamp:

Aug 11, 2009, 10:56:57 PM (14 years ago)

Author:

Sam Hocevar

Message:

Fix numerous compiler warnings.

Location:

abuse/trunk/src

Files:

• cache.cpp (modified) (2 diffs)
• director.cpp (modified) (1 diff)
• game.cpp (modified) (1 diff)
• imlib/palette.cpp (modified) (1 diff)
• imlib/pmenu.cpp (modified) (1 diff)
• imlib/specs.cpp (modified) (3 diffs)
• imlib/video.hpp (modified) (1 diff)
• lisp/lisp.cpp (modified) (1 diff)
• loadgame.cpp (modified) (1 diff)
• net/tcpip.cpp (modified) (4 diffs)
• objects.cpp (modified) (1 diff)
• sdlport/setup.cpp (modified) (1 diff)
• sdlport/video.cpp (modified) (4 diffs)

abuse/trunk/src/cache.cpp

@@ -511 +511 @@
     }
     
-    uint32_t tsaved=fp->read_uint32();
+    int tsaved = fp->read_uint32();
 
 
@@ -1193 +1193 @@
 void CacheList::free_oldest()
 {
-  uint32_t i,old_time=last_access;
+  int32_t old_time = last_access;
   CacheItem *ci=list,*oldest=NULL;
   ful=1;
 
-  for (i=0;i<total;i++,ci++)
-  {
-    if (ci->data && ci->last_access<old_time)
-    {
-      oldest=ci;
-      old_time=ci->last_access;
+  for (int i = 0; i < total; i++, ci++)
+  {
+    if (ci->data && ci->last_access < old_time)
+    {
+      oldest = ci;
+      old_time = ci->last_access;
     }
   }

abuse/trunk/src/director.cpp

@@ -85 +85 @@
     dist=31;
     if (y-y1<dist)
+    {
       if (y-y1<1) dist=0;
       else dist=y-y1;
+    }
 
     if (y2-y<dist)
+    {
       if (y2-y<1) dist=0;
       else dist=y2-y;
+    }
 
     int c=cmap[dist];

abuse/trunk/src/game.cpp

@@ -193 +193 @@
             continue;
 
-        if((unsigned)w >= xres - 1)
+        if(w >= xres - 1)
             w = xres - 2;
-        if((unsigned)h >= yres - 1)
+        if(h >= yres - 1)
             h = yres - 2;
         f->suggest.cx1 = (xres + 1) / 2 - w / 2;

abuse/trunk/src/imlib/palette.cpp

@@ -261 +261 @@
   else if (ncolors==16)
     for (i=0;i<ncolors;i++)
-      set(i,255-i&3,255-(i&4)>>2,255-(i&8)>>3);
+      set(i,255-(i&3),255-(i&4)>>2,255-(i&8)>>3);
   else
     for (i=0;i<ncolors;i++)
-      set(i,255-i%3,255-(i+1)%3,255-(i+2)%3);
+      set(i,255-(i%3),255-((i+1)%3),255-((i+2)%3));
 }
 

abuse/trunk/src/imlib/pmenu.cpp

@@ -189 +189 @@
     x=cx2-w-parent->x;
   if (h+y+parent->y>cy2)
+  {
     if (parent->y+parent->h+wm->font()->height()>cy2)
       y=-h;
-     else y=y-h+wm->font()->height()+5;
+    else y=y-h+wm->font()->height()+5;
+  }
 
 

abuse/trunk/src/imlib/specs.cpp

@@ -433 +433 @@
   for (s=access_string;*s;s++)
     if (toupper(*s)=='W')
+    {
       if (access)
         access=O_RDWR;
       else access=O_WRONLY;
+    }
 
   for (s=access_string;*s;s++)
@@ -627 +629 @@
 {
   double a;
-  write_uint32((long)(modf(x,&a)*(double)(1<<32-1)));
+  write_uint32((long)(modf(x,&a)*(double)(1<<31)));
   write_uint32((long)a);
 }
@@ -636 +638 @@
   a=read_uint32();
   b=read_uint32();
-  return (double)b+a/(double)(1<<32-1);
+  return (double)b+a/(double)(1<<31);
 }
 

abuse/trunk/src/imlib/video.hpp

@@ -24 +24 @@
 
 extern unsigned char current_background;
-extern unsigned int xres,yres;
+extern int xres,yres;
 extern int xoff,yoff;
 extern image *screen;

abuse/trunk/src/lisp/lisp.cpp

@@ -3115 +3115 @@
 void lisp_init(long perm_size, long tmp_size)
 {
-  int i;
+  unsigned int i;
   lsym_root=NULL;
   total_user_functions=0;

abuse/trunk/src/loadgame.cpp

@@ -94 +94 @@
   int w=cache.img(save_buts[0])->width();
   int mx=last_demo_mx-w/2;
-  if((unsigned)(mx + w + 10) > xres) mx = xres - w - 10;
-  if( mx < 0) mx = 0;
+  if(mx + w + 10 > xres) mx = xres - w - 10;
+  if(mx < 0) mx = 0;
 
   Jwindow *l_win=create_num_window(mx,MAX_SAVE_GAMES,NULL);

abuse/trunk/src/net/tcpip.cpp

@@ -28 +28 @@
 FILE *log_file=NULL;
 extern int net_start();
-void net_log(char *st, void *buf, long size)
+
+static void net_log(char const *st, void *buf, long size)
 {
     
@@ -40 +41 @@
 
 
-    fprintf(log_file,"%s%d - ",st,size);
+    fprintf(log_file,"%s%ld - ",st,size);
     int i;
     for (i=0;i<size;i++) 
@@ -50 +51 @@
 
     for (i=0;i<size;i++) 
-    fprintf(log_file,"%02x, ",*((unsigned char *)buf+i),*((unsigned char *)buf+i));
+    fprintf(log_file,"%02x, ",*((unsigned char *)buf+i));
     fprintf(log_file,"\n");
     fflush(log_file);
@@ -193 +194 @@
         }
         tmp[i] = num;
-        if (*np == ':' & !force_port)
+        if (*np == ':' && !force_port)
         {
             int x;

abuse/trunk/src/objects.cpp

@@ -1371 +1371 @@
       set_state(run_jump);
     if (xvel()!=0)
+    {
       if (direction>0)
         set_xvel(get_ability(type(),jump_top_speed));
       else
         set_xvel(-get_ability(type(),jump_top_speed));
+    }
     set_xacel(0);
 

abuse/trunk/src/sdlport/setup.cpp

@@ -43 +43 @@
 keys_struct keys;
 
-extern unsigned int xres, yres;
+extern int xres, yres;
 static unsigned int scale;
 

abuse/trunk/src/sdlport/video.cpp

@@ -43 +43 @@
 unsigned char current_background;
 int win_xscale, win_yscale, mouse_xscale, mouse_yscale;
-unsigned int xres, yres;
+int xres, yres;
 
 extern palette *lastl;
@@ -238 +238 @@
     Uint16 dinset;
 
-    if((unsigned)y > yres || (unsigned)x > xres)
+    if(y > yres || x > xres)
         return;
 
@@ -250 +250 @@
     }
     srcrect.x = x1;
-    if((unsigned)(x + (x2 - x1)) >= xres)
+    if(x + (x2 - x1) >= xres)
         xe = xres - x + x1 - 1;
     else
@@ -261 +261 @@
     }
     srcrect.y = y1;
-    if((unsigned)(y + (y2 - y1)) >= yres)
+    if(y + (y2 - y1) >= yres)
         ye = yres - y + y1 - 1;
     else