X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpcxtest2.c;h=dadb2c459d26acce04d3103bfc78a0d73e32e251;hb=8a04643047887934be90690e6a1254b403b17fc9;hp=aea2eb9a542bfecb1ca81e07808547083a5f0472;hpb=d0b4d523e0a90d036da0512a224389bf40895c09;p=16.git

diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index aea2eb9a..dadb2c45 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
+ * 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/bitmap.h"
-#include "src/lib/planar.h"
+#include "src/lib/16_vl.h"
+//#include "16/src/lib/bitmap.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,18 @@ void main() {
 	}
 
 //0000	bmp = bitmapLoadPcx("data/koishi~~.pcx");
-	bmp = bitmapLoadPcx("data/chikyuu.pcx");
+//0000	bmp = bitmapLoadPcx("data/chikyuu.pcx"/*, &gvar*/);
+	bmp = bitmapLoadPcx("data/maryai.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]);
+	//--00	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);