Changeset 17 for abuse/trunk/src/particle.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/particle.cpp (modified) (6 diffs)

abuse/trunk/src/particle.cpp

@@ -105 +105 @@
 part_frame::part_frame(bFILE *fp)
 {
-  t=fp->read_long();
+  t=fp->read_uint32();
   data=(part *)jmalloc(sizeof(part)*t,"particle frame");
   x1=y1=100000; x2=y2=-100000;
   for (int i=0;i<t;i++)
   {
-    short x=fp->read_short();
-    short y=fp->read_short();
+    int16_t x=fp->read_uint16();
+    int16_t y=fp->read_uint16();
     if (x<x1) x1=x;
     if (y<y1) y1=y;
@@ -118 +118 @@
     data[i].x=x;
     data[i].y=y;   
-    data[i].color=fp->read_byte(); 
+    data[i].color=fp->read_uint8(); 
   }
 }
@@ -156 +156 @@
 void part_frame::draw(image *screen, int x, int y, int dir)
 {
-  short cx1,cy1,cx2,cy2;
+  int16_t cx1,cy1,cx2,cy2;
   screen->get_clip(cx1,cy1,cx2,cy2);
   if (x+x1>cx2 || x+x2<cx1 || y+y1>cy2 || y+y2<cy1) return ;
@@ -196 +196 @@
 void scatter_line(int x1, int y1, int x2, int y2, int c, int s)
 {
-        short cx1, cy1, cx2, cy2;
+        int16_t cx1, cy1, cx2, cy2;
         screen->get_clip( cx1, cy1, cx2, cy2 );
 
@@ -223 +223 @@
 void ascatter_line(int x1, int y1, int x2, int y2, int c1, int c2, int s)
 {
-        short cx1, cy1, cx2, cy2;
+        int16_t cx1, cy1, cx2, cy2;
         screen->get_clip( cx1, cy1, cx2, cy2 );
 
@@ -234 +234 @@
 
         int w = screen->width();
-        uchar *addr;
+        uint8_t *addr;
 
         while( t-- )