X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpalettel.c;h=3bf7bb570f7ab0a2b517bb0411a78b5f8fe4bbd0;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=5ce5c809c2c6bf7efca575f76156541eb979c651;hpb=e7560148aa2da2b398dfeb8c5ee7e49bf9deff0b;p=16.git

diff --git a/src/palettel.c b/src/palettel.c
index 5ce5c809..3bf7bb57 100755
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -19,38 +19,25 @@
  * Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-
-#include "src/lib/modex16.h"
-#include "src/lib/bakapee.h"
-
-global_game_variables_t gvar;
-byte *pal;
-char *bakapee;
-word i;
-
-void
-main(int argc, char *argv[])
+#include "src/lib/16_vl.h"
+void main(int argc, char *argv[])
 {
-	//page.width += 32;
-	//page.height += 32;
-	pal = modexNewPal();
-	bakapee = malloc(64);
-	if(argv[1]) bakapee = argv[1];
-	else bakapee = "data/default.pal";
-//	modexPalSave(pal);
-	VGAmodeX(1, 1, &gvar);
-	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
-	modexPalBlack();
+	static global_game_variables_t gvar; word i;	char bakapee[64] = "data/16.pal";
+	if(argv[1]) strcpy(bakapee, argv[1]);// modexPalSave(&gvar.video.dpal); modexFadeOff(4, &gvar.video.dpal); modexPalBlack();
 
-	modexLoadPalFile(bakapee, &pal);
-	modexPalUpdate1(pal);
-	modexFadeOn(1, pal);
-	modexpdump(&gvar.video.page[0]);
-	getch();
+	TL_VidInit(&gvar);	VGAmodeX(1, 0, &gvar);
+	VL_LoadPalFile(bakapee, &gvar.video.palette, &gvar);		//modexLoadPalFile(bakapee, &(gvar.video.palette));
+	PALPROGRAMSNEWPAGE
+	VL_ShowPage(&gvar.video.page[0], 1, 0);
+	modexpdump(0, &gvar);
+	while(!kbhit()){ /*VL_modexPalScramble(&gvar.video.palette);*/ }
+	modexPalSave(&gvar.video.palette);
 	VGAmodeX(0, 0, &gvar);
-	modexPalUpdate1(pal);
-	/*for(i=0;i<768;i++)
+	for(i=0;i<16;i++)
 	{
-		printf("%02X ", pal[i]);
-	}*/
+		printf("%02x", gvar.video.palette[i]);
+		if((!(i%16)) && i) printf("\n");
+		else printf(" ");
+	}
+	modexPalUpdate(&gvar.video.palette);
 }