X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpcxtest2.c;h=ab6e3b1e4291fb69eaf49f93ba407eaf02c8e3b0;hb=5ad8cc4e485b54223dac7f5416ce8463e4dc09a4;hp=f92c300be87c7871db32ff7404e4b0312bf4530e;hpb=989f287818c93cf9b1ff96c13e66720571210513;p=16.git

diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index f92c300b..ab6e3b1e 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-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -27,7 +27,6 @@
 #include "src/lib/bitmap.h"
 //----#include "src/lib/planar.h"
 
-global_game_variables_t gvar;
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 
 /*
@@ -56,6 +55,7 @@ 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;
 	int i;
@@ -85,7 +85,7 @@ 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);
@@ -95,7 +95,7 @@ void main() {
 	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);