[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.98,1.99 simon.h,1.23,1.24 vga.cpp,1.14,1.15

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv6941/simon

Modified Files:
	simon.cpp simon.h vga.cpp 
Log Message:

Add Named unknown variable in simon, patch #644907


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- simon.cpp	27 Nov 2002 15:46:46 -0000	1.98
+++ simon.cpp	28 Nov 2002 00:22:24 -0000	1.99
@@ -3659,7 +3659,7 @@
 		vsp++;
 
 	vsp->unk6 = b;
-	vsp->unk5 = 0;
+	vsp->priority = 0;
 	vsp->unk4 = 0;
 
 	vsp->y = d;

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- simon.h	27 Nov 2002 15:08:24 -0000	1.23
+++ simon.h	28 Nov 2002 00:22:24 -0000	1.24
@@ -76,7 +76,9 @@
 	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 {

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- vga.cpp	24 Nov 2002 13:44:24 -0000	1.14
+++ vga.cpp	28 Nov 2002 00:22:24 -0000	1.15
@@ -311,7 +311,7 @@
 
 	vsp->base_color = e;
 	vsp->unk6 = a;
-	vsp->unk5 = 0;
+	vsp->priority = 0;
 	vsp->unk4 = 0;
 	vsp->image = 0;
 	vsp->x = c;
@@ -1178,29 +1178,29 @@
 	}
 
 	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++;
 }