FPU detection added

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 03859245552740a2d3bcc6fd5942b4da8f3ad0e5..f14ec0cd2736bf1898678020e3a2d5a86890817f 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -20,22 +20,15 @@
  *\r
  */\r
 \r
-#include "src/lib/16_scr.h"\r
+#include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-#include "src/lib/wcpu/wcpu.h"\r
-#include "src/lib/mapread.h"\r
 #include "src/lib/16_dbg.h"\r
 \r
 //#define FADE\r
 #define MODEX  //this is for mode x initiating\r
 \r
-extern boolean dbg_nommpmca;\r
-\r
-//word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
-//bitmap_t *p;\r
-global_game_variables_t gvar;\r
+//bitmap_t p;\r
 static map_t map;\r
-player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
 //word pn=0; //i forgot ww\r
 float t;\r
@@ -45,7 +38,6 @@ pan_t pan;
 boolean panswitch=0;//1\r
 //extern boolean pageflipflop=1;\r
        unsigned int i;\r
-       const char *cpus;\r
        //static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */\r
 \r
        //map_view_db_t pgid[4];\r
@@ -60,8 +52,8 @@ boolean panswitch=0;//1
 \r
 void main(int argc, char *argv[])\r
 {\r
-       dbg_nommpmca=1;\r
-\r
+       static global_game_variables_t gvar;\r
+       static player_t player[MaxPlayers];\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
@@ -82,8 +74,8 @@ void main(int argc, char *argv[])
        //mappalptr = map.tiles->btdata->palette;\r
 \r
        /* data */\r
-       player[0].data = malloc(48*128); //TODO use exmm\r
-       *player[0].data = bitmapLoadPcx("data/chikyuu.pcx"); // load sprite\r
+       player[0].data = malloc(72*128); //TODO use exmm\r
+       *player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
 \r
        /* create the planar buffer */\r
 ////++++       (player[0].data) = *planar_buf_from_bitmap(&p);\r
@@ -222,7 +214,7 @@ void main(int argc, char *argv[])
        }       //p\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); }\r
+       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p\r
        if(IN_KeyDown(22)){\r
        paloffset=0; modexPalBlack(); modexPalUpdate(player[0].data, &paloffset, 0, 0);\r
        printf("1paloffset      =       %d\n", paloffset/3);\r
@@ -262,8 +254,8 @@ void main(int argc, char *argv[])
        }\r
        if(IN_KeyDown(66))      //f8\r
        {\r
-//             modexDrawSprite(mv[0].page, 16, 16, p);\r
-               modexDrawSprite(mv[0].page, 32+48, 16, (player[0].data));\r
+//             modexDrawSprite(mv[0].page, 16, 16, &p);\r
+               modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
        }\r
        //TODO fmemtest into page\r
        /*if(IN_KeyDown(4+1))   //4\r
@@ -293,14 +285,7 @@ void main(int argc, char *argv[])
        printf("\nProject 16 scroll.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        SCROLLEXITMESG;\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
-       printf("detected CPU type: %s\n", cpus);\r
+       WCPU_cpufpumesg();\r
 #ifdef MODEX\r
 #ifdef FADE\r
        modexFadeOn(4, dpal);\r