Changeset 17 for abuse/trunk/src/old_earth_menu.cppTweet

Timestamp:

Nov 10, 2005, 9:41:13 PM (17 years ago)

Author:

Sam Hocevar

Message:

• absolute shitloads of 64 bit fixes.

File:

• abuse/trunk/src/old_earth_menu.cpp (modified) (9 diffs)

abuse/trunk/src/old_earth_menu.cpp

@@ -35 +35 @@
   for (y=y1;y<=y2;y++)
   {
-    unsigned char *sl=screen->scan_line(y)+x1;
+    uint8_t *sl=screen->scan_line(y)+x1;
     for (x=x1;x<=x2;x++,sl++)
     {
-      unsigned char *paddr=(unsigned char *)pal->addr()+(*sl)*3;
-      unsigned char r=((*(paddr++))-r_to)*percent/256+r_to;
-      unsigned char g=((*(paddr++))-g_to)*percent/256+g_to;
-      unsigned char b=((*(paddr++))-b_to)*percent/256+b_to;
+      uint8_t *paddr=(uint8_t *)pal->addr()+(*sl)*3;
+      uint8_t r=((*(paddr++))-r_to)*percent/256+r_to;
+      uint8_t g=((*(paddr++))-g_to)*percent/256+g_to;
+      uint8_t b=((*(paddr++))-b_to)*percent/256+b_to;
       *sl=color_table->lookup_color((r)>>3,(g)>>3,(b)>>3);
     }
@@ -61 +61 @@
   for (y=y1;y<=y2;y++)
   {
-    unsigned char *sl=screen->scan_line(y)+x1;
+    uint8_t *sl=screen->scan_line(y)+x1;
     for (x=x1;x<=x2;x++,sl++)
     {
-      unsigned char *paddr=(unsigned char *)pal->addr()+(*sl)*3;
-      unsigned char r=(*(paddr++))*amount/256;
-      unsigned char g=(*(paddr++))*amount/256;
-      unsigned char b=(*(paddr++))*amount/256;
+      uint8_t *paddr=(uint8_t *)pal->addr()+(*sl)*3;
+      uint8_t r=(*(paddr++))*amount/256;
+      uint8_t g=(*(paddr++))*amount/256;
+      uint8_t b=(*(paddr++))*amount/256;
       *sl=color_table->lookup_color((r)>>3,(g)>>3,(b)>>3);
     }
@@ -251 +251 @@
 {
   int x,size;
-  ushort *remap;
+  uint16_t *remap;
 } ;
 
@@ -261 +261 @@
   int x1=10000,x2=0;
   int iw=im->width();  
-  ushort r,co,off,cc;
+  uint16_t r,co,off,cc;
   int y=0;
   for (;y<mask_height;y++)
   {
     mask_line *n=p+y;
-    uchar *sl=screen->scan_line(y+sy)+sx+n->x;
-    uchar *sl2=im->scan_line(y);
-//    uchar *sl3=clouds->scan_line(y);
-    ushort *rem=n->remap;
+    uint8_t *sl=screen->scan_line(y+sy)+sx+n->x;
+    uint8_t *sl2=im->scan_line(y);
+//    uint8_t *sl3=clouds->scan_line(y);
+    uint16_t *rem=n->remap;
     if (sx+n->x<x1) x1=sx+n->x;    
     int x=0;
@@ -301 +301 @@
   {
     // find the start of the run..
-    uchar *sl=mask->scan_line(y);    
+    uint8_t *sl=mask->scan_line(y);    
     int x=0;
     while (*sl==0) { sl++; x++; }
@@ -313 +313 @@
 
     // now calculate remap for line
-    p[y].remap=(ushort *)jmalloc(size*2,"mask remap");
-    ushort *rem=p[y].remap;
+    p[y].remap=(uint16_t *)jmalloc(size*2,"mask remap");
+    uint16_t *rem=p[y].remap;
     for (x=0;x<size;x++,rem++)
     {
@@ -508 +508 @@
   ico_button *buts[MENU_TICONS];
 
-  long maxx=0,maxy=0;
+  int32_t maxx=0,maxy=0;
   int i=0;
   for (;i<MENU_TICONS;i++)
@@ -519 +519 @@
     menu_icons[i*3+2]=cash.reg("art/icons.spe",name,SPEC_IMAGE,1);
 
-    long x=WINDOW_FRAME_LEFT+(i%9)*cash.img(menu_icons[0])->width();
-    long y=WINDOW_FRAME_TOP+(i/9)*cash.img(menu_icons[0])->height();
+    int32_t x=WINDOW_FRAME_LEFT+(i%9)*cash.img(menu_icons[0])->width();
+    int32_t y=WINDOW_FRAME_TOP+(i/9)*cash.img(menu_icons[0])->height();
     if (x>maxx) maxx=x;
     if (y>maxy) maxy=y;
@@ -587 +587 @@
   event ev;
 //  main_pm->draw(screen,eh,1);
-  long x=84,y=60;
+  int32_t x=84,y=60;
   Cell *v=find_symbol("earth_x");
   if (v && DEFINEDP(v)) x=lnumber_value(symbol_value(v));