palette is now arrays

[16.git] / src / 16.c

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