X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpalettel.c;h=9249e540d96f7efbe501ea33bb267f31720a8b2b;hb=f142a92a2ff911c135f5189349eb4a68818ac164;hp=e7f2ace0fc3323edfe92fe0d46a260252e2f0a93;hpb=02ebe5d276d33d55b9d46fef19a8ef939b7c9743;p=16.git

diff --git a/src/palettel.c b/src/palettel.c
index e7f2ace0..9249e540 100755
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -23,32 +23,29 @@
 #include "src/lib/16_vl.h"
 #include "src/lib/bakapee.h"
 
-byte *pal;
-char *bakapee;
 word i;
 
-void
-main(int argc, char *argv[])
+void main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	//page.width += 32;
-	//page.height += 32;
-	pal = modexNewPal();
-	bakapee = malloc(64);
-	if(argv[1]) bakapee = argv[1];
-	else bakapee = "data/default.pal";
-//	modexPalSave(pal);
+	char bakapee[64] = "data\default.pal";
+
+	if(argv[1]) strcpy(bakapee, argv[1]);
+
+
+	modexPalSave(&(gvar.video.palette));
+	VL_modexPalScramble(&(gvar.video.palette));
 	VGAmodeX(1, 1, &gvar);
 	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
 	modexPalBlack();
 
-	modexLoadPalFile(bakapee, &pal);
-	modexPalUpdate(pal);
-	modexFadeOn(1, pal);
+	modexLoadPalFile(bakapee, &(gvar.video.palette));
+	modexPalUpdate(&(gvar.video.palette));
+	modexFadeOn(1, &(gvar.video.palette));
 	modexpdump(&gvar.video.page[0]);
-	getch();
+//	getch();
 	VGAmodeX(0, 0, &gvar);
-	modexPalUpdate(pal);
+	modexPalUpdate(&(gvar.video.palette));
 	/*for(i=0;i<768;i++)
 	{
 		printf("%02X ", pal[i]);