X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpcxtest2.c;h=25d30141c75a8ad48b81940ae65072887304a4b6;hb=4d4c2774d4e51f7356f7a5ef32ef61a9fd2c299a;hp=c6706448fec337396137ae2f489c59f946e00a56;hpb=2accbf2668001e82a8fec1e75f37c195996186b0;p=16.git

diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index c6706448..25d30141 100755
--- a/src/pcxtest2.c
+++ b/src/pcxtest2.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -23,11 +23,11 @@
 #include <stdio.h>
 #include <dos.h>
 #include <string.h>
-#include "src/lib/modex16.h"
+#include "src/lib/16_vl.h"
 #include "src/lib/bitmap.h"
-#include "src/lib/planar.h"
+//----#include "src/lib/planar.h"
 
-global_game_variables_t gvar;
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 
 /*
 void
@@ -55,8 +55,9 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
 */
 
 void main() {
+	static global_game_variables_t gvar;
 	bitmap_t bmp;
-	planar_buf_t *p;
+//----	planar_buf_t *p;
 	int i;
 	word start;
 	int plane;
@@ -84,17 +85,17 @@ void main() {
 	}
 
 //0000	bmp = bitmapLoadPcx("data/koishi~~.pcx");
-	bmp = bitmapLoadPcx("data/chikyuu.pcx");
+	bmp = bitmapLoadPcx("data/chikyuu.pcx", &gvar);
 //	bmp = bitmapLoadPcx("data/koishi^^.pcx");
 //	bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
-	p = planar_buf_from_bitmap(&bmp);
+//----	p = planar_buf_from_bitmap(&bmp);
 	VGAmodeX(1, 1, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 	gvar.video.page[0].sw+=32;
 	gvar.video.page[0].sh+=32;
 
 	/* fix up the palette and everything */
-	modexPalUpdate1(bmp.palette);
+	modexPalUpdate(bmp.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);