Ticket #8138: simon_unk.patch

simon/simon.cpp

@@ -3659 +3659 @@
                 vsp++;
 
         vsp->unk6 = b;
-        vsp->unk5 = 0;
+        vsp->priority = 0;
         vsp->unk4 = 0;
 
         vsp->y = d;

simon/simon.h

@@ -76 +76 @@
         uint16 image;
         uint16 base_color;
         uint16 x, y;                                                                    /* actually signed numbers */
-        uint16 unk4, unk5, unk6, unk7;
+        uint16 unk4;
+        uint16 priority;
+        uint16 unk6, unk7;
 };
 
 struct VgaSleepStruct {

simon/vga.cpp

@@ -311 +311 @@
 
         vsp->base_color = e;
         vsp->unk6 = a;
-        vsp->unk5 = 0;
+        vsp->priority = 0;
         vsp->unk4 = 0;
         vsp->image = 0;
         vsp->x = c;
@@ -1178 +1178 @@
         }
 
         memcpy(&bak, vsp, sizeof(bak));
-        bak.unk5 = pri;
+        bak.priority = pri;
         bak.unk6 |= 0x8000;
 
         vus2 = vsp;
 
-        if (vsp != _vga_sprites && pri < vsp[-1].unk5) {
+        if (vsp != _vga_sprites && pri < vsp[-1].priority) {
                 do {
                         vsp--;
-                } while (vsp != _vga_sprites && pri < vsp[-1].unk5);
+                } while (vsp != _vga_sprites && pri < vsp[-1].priority);
                 do {
                         memcpy(vus2, vus2 - 1, sizeof(VgaSprite));
                 } while (--vus2 != vsp);
                 memcpy(vus2, &bak, sizeof(VgaSprite));
-        } else if (vsp[1].id != 0 && pri >= vsp[1].unk5) {
+        } else if (vsp[1].id != 0 && pri >= vsp[1].priority) {
                 do {
                         vsp++;
-                } while (vsp[1].id != 0 && pri >= vsp[1].unk5);
+                } while (vsp[1].id != 0 && pri >= vsp[1].priority);
                 do {
                         memcpy(vus2, vus2 + 1, sizeof(VgaSprite));
                 } while (++vus2 != vsp);
                 memcpy(vus2, &bak, sizeof(VgaSprite));
         } else {
-                vsp->unk5 = pri;
+                vsp->priority = pri;
         }
         _vga_sprite_changed++;
 }