X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=src%2F16.c;h=9877b7df58a93f429d6e7daad82228275f8a5997;hb=1d5d18a6c438c7b78af0b91ca29e41747aa0d148;hp=8ef4d904a17166c41b7990365d82415b5bb37f37;hpb=6feaff34f8461d5e3a9542c2df359b585c1e5120;p=16.git

diff --git a/src/16.c b/src/16.c
index 8ef4d904..9877b7df 100755
--- a/src/16.c
+++ b/src/16.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.
  *
@@ -23,8 +23,6 @@
 #include "src/16.h"
 
 engi_stat_t engi_stat;
-const char *cpus;
-byte *dpal, *gpal;
 player_t player[MaxPlayers];
 
 void
@@ -36,12 +34,10 @@ main(int argc, char *argv[])
 	engi_stat = ENGI_RUN;
 
 	/* save the palette */
-	dpal = modexNewPal();
-	modexPalSave(dpal);
-	modexFadeOff(4, dpal);
-	gpal = modexNewPal();
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
+	modexPalSave(gvar.video.dpal);
+	modexFadeOff(4, gvar.video.dpal);
+	modexPalSave(gvar.video.palette);
+	modexSavePalFile("data/g.pal", gvar.video.palette);
 	VGAmodeX(1, 1, &gvar);
 //	modexPalBlack();	//so player will not see loadings~
 	IN_Default(0,&player,ctrl_Joystick);
@@ -53,17 +49,10 @@ main(int argc, char *argv[])
 		shinku(&gvar);
 		_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
 	}
-	switch(detectcpu())
-	{
-		case 0: cpus = "8086/8088 or 186/88"; break;
-		case 1: cpus = "286"; break;
-		case 2: cpus = "386 or newer"; break;
-		default: cpus = "internal error"; break;
-	}
 	Shutdown16(&gvar);
 	VGAmodeX(0, 1, &gvar);
 	printf("Project 16 16.exe. This is supposed to be the actual finished game executable!\n");
 	printf("version %s\n", VERSION);
-	printf("detected CPU type: %s\n", cpus);
-	modexFadeOn(4, dpal);
+	WCPU_cpufpumesg();
+	modexFadeOn(4, gvar.video.dpal);
 }