X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpcxtest.c;h=047fb7a5e4e0c372b0ad6ab7dcec9c3cb7e6e88d;hb=86619c6a50b07c52481161da4b549ffb5e403e66;hp=29183665112acc02b629e4c3381e74cb4a8c21ca;hpb=28f2a71de747c88b57885206f55d1f7c6e0656cf;p=16.git

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 29183665..047fb7a5 100755
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -32,13 +32,12 @@
 
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 
-#define PCXBMPVAR		player[0].data
+#define PCXBMPVAR		gvar.player[0].data
 #define PCXBMP			*PCXBMPVAR
 #define PCXBMPPTR		PCXBMPVAR
 
 void main() {
 	static global_game_variables_t gvar;
-	static player_t player[MaxPlayers];
 //----	planar_buf_t *p;
 	word start;
 	float t1, t2;
@@ -74,15 +73,15 @@ void main() {
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
 	/* fix up the palette and everything */
-	modexPalUpdate1(&PCXBMP->palette);
+	modexPalUpdate(&PCXBMP->palette);
 
 	/* clear and draw one sprite and one bitmap */
-	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);
+	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1);
 
 	/* non sprite comparison */
-	start = *clockw;
+	/*start = *clockw;
 	//for(i=0; i<100 ;i++) {
-		oldDrawBmp(VGA, 20, 20, PCXBMPPTR, 0);
+		oldDrawBmp(VGA, 0, 0, PCXBMPPTR, 0);
 	//}
 
 	start = *clockw;
@@ -97,20 +96,23 @@ void main() {
 //0000		modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 20, 20, 128, 20, 64, 64);
 		modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
 	//}
-	t2 = (*clockw-start)/18.2;
+	t2 = (*clockw-start)/18.2;*/
 
 
 	start = *clockw;
 	//for(i=0; i<100 ;i++) {
-		oldDrawBmp(VGA, 20, 20, PCXBMPPTR, 1);
+		oldDrawBmp(VGA, 0, 0, PCXBMPPTR, 1);
 	//}
+	t1 = (*clockw-start) /18.2;
 
 
 	start = *clockw;
 	//for(i=0; i<100 ;i++) {
 //0000		modexDrawSprite(&gvar.video.page[0], 20, 20, PCXBMPPTR);
-		modexDrawSprite(&gvar.video.page[0], 160, 120, PCXBMPPTR);
+		modexDrawSprite(&(gvar.video.page[0]), 160, 120, PCXBMPPTR);
+		modexDrawBmp(&gvar.video.page[0], 0, 128, PCXBMPPTR);
 	//}
+	t2 = (*clockw-start)/18.2;
 	//_fmemset(MK_FP(0xA000, 0), (int)p->plane, gvar.video.page[0].sw*(gvar.video.page[0].sh*2));
 	//modexDrawBmp(&gvar.video.page[0], 0, 0, PCXBMPPTR);
 	while(!kbhit())