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

diff --git a/src/palettel.c b/src/palettel.c
index 15a8111f..9249e540 100755
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -20,37 +20,34 @@
  *
  */
 
-#include "src/lib/modex16.h"
+#include "src/lib/16_vl.h"
 #include "src/lib/bakapee.h"
 
-global_game_variables_t gvar;
-byte *pal;
-char *bakapee;
 word i;
-page_t page;
 
-void
-main(int argc, char *argv[])
+void main(int argc, char *argv[])
 {
-	page = modexDefaultPage();
-	//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, &gvar);
+	static global_game_variables_t gvar;
+	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);
-	modexPalUpdate1(pal);
-	modexFadeOn(1, pal);
-	pdump(&page);
-	getch();
-	VGAmodeX(0, &gvar);
-	for(i=0;i<768;i++)
+	modexLoadPalFile(bakapee, &(gvar.video.palette));
+	modexPalUpdate(&(gvar.video.palette));
+	modexFadeOn(1, &(gvar.video.palette));
+	modexpdump(&gvar.video.page[0]);
+//	getch();
+	VGAmodeX(0, 0, &gvar);
+	modexPalUpdate(&(gvar.video.palette));
+	/*for(i=0;i<768;i++)
 	{
 		printf("%02X ", pal[i]);
-	}
+	}*/
 }