Changeset 896

Timestamp:

Aug 12, 2013, 12:42:40 AM (11 years ago)

Author:

alloc

Message:

Daodan 3.5: Fix displaying screens larger than screen res

File:

• Daodan/src/patches/Patches.c (modified) (1 diff)

Daodan/src/patches/Patches.c

@@ -30 +30 @@
         UUtUns16 y;
 
+        UUtUns16 index;
+        UUtUns16 remaining_width;
+        UUtUns16 remaining_height;
+
+        M3tPointScreen dest_point;
+        dest_point.z = inDestPoint->z;
+        dest_point.invW = inDestPoint->invW;
+
+        index = 0;
+        remaining_height = inHeight;
+        dest_point.y = (UUtInt16)((UUtUns16)inDestPoint->y);
         for (y = 0; y < inBigBitmap->num_y; y++)
         {
+                remaining_width = inWidth;
+                dest_point.x = (UUtInt16)((UUtUns16)inDestPoint->x);
                 for (x = 0; x < inBigBitmap->num_x; x++)
                 {
-                        UUtUns16 index;
-                        void* texture; // M3tTextureMap
-                        M3tPointScreen dest_point;
                         UUtUns16 width;
                         UUtUns16 height;
-                        UUtInt16 temp;                  
-                        UUtInt32 x_times_maxwidth;
-                        UUtInt32 y_times_maxheight;
                         
-                        index = x + (y * inBigBitmap->num_x);
-                        texture = inBigBitmap->textures[index];
-                        
-                        x_times_maxwidth = x * 256;
-                        y_times_maxheight = y * 256;
-                        
-                        // Cast to Unsigned to get the 16 bit int representation and then to signed to get the actual value. Doing it in one step gives wrong results (at least with gcc)
-                        dest_point.x = (UUtInt16)((UUtUns16)inDestPoint->x) + x_times_maxwidth;
-                        dest_point.y = (UUtInt16)((UUtUns16)inDestPoint->y) + y_times_maxheight;
-                        dest_point.z = inDestPoint->z;
-                        dest_point.invW = inDestPoint->invW;
-
-                        temp = (UUtInt16) ( ((UUtInt32)inWidth - x_times_maxwidth) > 0 ? ((UUtInt32)inWidth - x_times_maxwidth) : 0);
-                        width = 256 < (UUtUns16)temp ? 256 : temp;
-                        temp = (UUtInt16) ( ((UUtInt32)inHeight - y_times_maxheight) > 0 ? ((UUtInt32)inHeight - y_times_maxheight) : 0);
-                        height = 256 < (UUtUns16)temp ? 256 : temp;
+                        width = 256 < remaining_width ? 256 : remaining_width;
+                        height = 256 < remaining_height ? 256 : remaining_height;
                                 
-                        M3rDraw_Bitmap(texture, &dest_point, width, height, inShade, inAlpha);
+                        M3rDraw_Bitmap(inBigBitmap->textures[index], &dest_point, width, height, inShade, inAlpha);
+
+                        dest_point.x += 256;
+                        remaining_width -= 256;
+                        index++;
                 }
+                dest_point.y += 256;
+                remaining_height -= 256;
         }
 }