shithub: duke3d

Info  •  Files  •  Log  •  Branches

64-bit: Fix more warnings.

--- a/Engine/src/engine.c

+++ b/Engine/src/engine.c

@@ -1317,7 +1317,7 @@

                 i *= tsizy;

             else

                 i <<= tsizy;

-            bufplce[z] = tiles[globalpicnum].data+i;

+            bufplce[z] = (intptr_t) tiles[globalpicnum].data+i;

             vince[z] = swal[x+z]*globalyscale;

             vplce[z] = globalzd + vince[z]*(y1ve[z]-globalhoriz+1);

@@ -1346,24 +1346,24 @@

         if ((bad != 0) || (u4 >= d4))

         {

             if (!(bad&1))

-                prevlineasm1(vince[0],palookupoffse[0],y2ve[0]-y1ve[0],vplce[0],bufplce[0],ylookup[y1ve[0]]+x+frameoffset+0);

+                prevlineasm1(vince[0],palookupoffse[0],y2ve[0]-y1ve[0],vplce[0],(uint8_t*) bufplce[0],ylookup[y1ve[0]]+x+frameoffset+0);

             if (!(bad&2))

-                prevlineasm1(vince[1],palookupoffse[1],y2ve[1]-y1ve[1],vplce[1],bufplce[1],ylookup[y1ve[1]]+x+frameoffset+1);

+                prevlineasm1(vince[1],palookupoffse[1],y2ve[1]-y1ve[1],vplce[1],(uint8_t*) bufplce[1],ylookup[y1ve[1]]+x+frameoffset+1);

             if (!(bad&4))

-                prevlineasm1(vince[2],palookupoffse[2],y2ve[2]-y1ve[2],vplce[2],bufplce[2],ylookup[y1ve[2]]+x+frameoffset+2);

+                prevlineasm1(vince[2],palookupoffse[2],y2ve[2]-y1ve[2],vplce[2],(uint8_t*) bufplce[2],ylookup[y1ve[2]]+x+frameoffset+2);

             if (!(bad&8))

-                prevlineasm1(vince[3],palookupoffse[3],y2ve[3]-y1ve[3],vplce[3],bufplce[3],ylookup[y1ve[3]]+x+frameoffset+3);

+                prevlineasm1(vince[3],palookupoffse[3],y2ve[3]-y1ve[3],vplce[3],(uint8_t*) bufplce[3],ylookup[y1ve[3]]+x+frameoffset+3);

             continue;

         }

         if (u4 > y1ve[0])

-            vplce[0] =prevlineasm1(vince[0],palookupoffse[0],u4-y1ve[0]-1,vplce[0],bufplce[0],ylookup[y1ve[0]]+x+frameoffset+0);

+            vplce[0] =prevlineasm1(vince[0],palookupoffse[0],u4-y1ve[0]-1,vplce[0],(uint8_t*) bufplce[0],ylookup[y1ve[0]]+x+frameoffset+0);

         if (u4 > y1ve[1])

-            vplce[1] = prevlineasm1(vince[1],palookupoffse[1],u4-y1ve[1]-1,vplce[1],bufplce[1],ylookup[y1ve[1]]+x+frameoffset+1);

+            vplce[1] = prevlineasm1(vince[1],palookupoffse[1],u4-y1ve[1]-1,vplce[1],(uint8_t*) bufplce[1],ylookup[y1ve[1]]+x+frameoffset+1);

         if (u4 > y1ve[2])

-            vplce[2] = prevlineasm1(vince[2],palookupoffse[2],u4-y1ve[2]-1,vplce[2],bufplce[2],ylookup[y1ve[2]]+x+frameoffset+2);

+            vplce[2] = prevlineasm1(vince[2],palookupoffse[2],u4-y1ve[2]-1,vplce[2],(uint8_t*) bufplce[2],ylookup[y1ve[2]]+x+frameoffset+2);

         if (u4 > y1ve[3])

-            vplce[3] = prevlineasm1(vince[3],palookupoffse[3],u4-y1ve[3]-1,vplce[3],bufplce[3],ylookup[y1ve[3]]+x+frameoffset+3);

+            vplce[3] = prevlineasm1(vince[3],palookupoffse[3],u4-y1ve[3]-1,vplce[3],(uint8_t*) bufplce[3],ylookup[y1ve[3]]+x+frameoffset+3);

         if (d4 >= u4) 

             vlineasm4(d4-u4+1,ylookup[u4]+x+frameoffset);

@@ -1371,13 +1371,13 @@

         i = x+frameoffset+ylookup[d4+1];

         if (y2ve[0] > d4)

-            prevlineasm1(vince[0],palookupoffse[0],y2ve[0]-d4-1,vplce[0],bufplce[0],i+0);

+            prevlineasm1(vince[0],palookupoffse[0],y2ve[0]-d4-1,vplce[0],(uint8_t*) bufplce[0],(uint8_t*) i+0);

         if (y2ve[1] > d4)

-            prevlineasm1(vince[1],palookupoffse[1],y2ve[1]-d4-1,vplce[1],bufplce[1],i+1);

+            prevlineasm1(vince[1],palookupoffse[1],y2ve[1]-d4-1,vplce[1],(uint8_t*) bufplce[1],(uint8_t*) i+1);

         if (y2ve[2] > d4)

-            prevlineasm1(vince[2],palookupoffse[2],y2ve[2]-d4-1,vplce[2],bufplce[2],i+2);

+            prevlineasm1(vince[2],palookupoffse[2],y2ve[2]-d4-1,vplce[2],(uint8_t*) bufplce[2],(uint8_t*) i+2);

         if (y2ve[3] > d4)

-            prevlineasm1(vince[3],palookupoffse[3],y2ve[3]-d4-1,vplce[3],bufplce[3],i+3);

+            prevlineasm1(vince[3],palookupoffse[3],y2ve[3]-d4-1,vplce[3],(uint8_t*) bufplce[3],(uint8_t*) i+3);

     }

     for(; x<=x2; x++)

     {