X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpalettel.c;h=1a487bab82f39219d962e86b4be6d0bfe91fb88e;hb=96dd0791aae1ca753abc0f19aaaf1db2122f971f;hp=04beeff673d6377236e85bebd05f1245ff09005f;hpb=631d2bde47de81ead5300f7aca378447387f254c;p=16.git

diff --git a/src/palettel.c b/src/palettel.c
index 04beeff6..1a487bab 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 & yakui-lover
+ * 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;
 
 void
 main(int argc, char *argv[])
 {
-	//page.width += 32;
-	//page.height += 32;
-	pal = modexNewPal();
+	static global_game_variables_t gvar;
 	bakapee = malloc(64);
 	if(argv[1]) bakapee = argv[1];
 	else bakapee = "data/default.pal";
-//	modexPalSave(pal);
+	modexPalSave(&(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);
+	modexLoadPalFile(bakapee, &(gvar.video.palette));
+	modexPalUpdate(&(gvar.video.palette));
+	modexFadeOn(1, &(gvar.video.palette));
 	modexpdump(&gvar.video.page[0]);
 	getch();
 	VGAmodeX(0, 0, &gvar);
-	modexPalUpdate1(pal);
+	modexPalUpdate(&(gvar.video.palette));
 	/*for(i=0;i<768;i++)
 	{
 		printf("%02X ", pal[i]);
 	}*/
+	free(bakapee);
 }