]> 4ch.mooo.com Git - 16.git/blobdiff - src/zcroll.c
__seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd...
[16.git] / src / zcroll.c
index 3162336759841b37722be8febc8497033898c6a3..888a00341c67bed7dffab102e30475518044f91a 100755 (executable)
@@ -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
 \r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-#include "src/lib/wcpu/wcpu.h"\r
+#include "src/lib/16render.h"\r
+#include "src/lib/16_dbg.h"\r
 \r
-//word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
-//bitmap_t *p;\r
-global_game_variables_t gvar;\r
+#define FADE\r
+\r
+//map_view_t mv[4];\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
-sword bakapee;\r
-pan_t pan;\r
+\r
 //debugswitches\r
 boolean panswitch=0,baka=0;\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
+extern boolean pagenorendermap;        //default: 0\r
+unsigned int i;\r
+\r
+#ifdef FADE\r
+//static word paloffset=0;\r
+#endif\r
+byte *ptr;\r
+memptr pal;\r
 \r
-       //map_view_db_t pgid[4];\r
-       word pg;\r
-//#ifdef FADE\r
-       static word paloffset=0;\r
-       byte *dpal;\r
-//#endif\r
-       byte *gpal;\r
-       byte *ptr;\r
-       byte *mappalptr;\r
+#define FILENAME_1     "data/spri/chikyuu.vrs"\r
+#define FILENAME_1P    "data/spri/chikyuu.pal"\r
+#define FILENAME_2     "data/spri/me.vrs"\r
+#define FILENAME_2P    "data/spri/me.pal"\r
 \r
 void main(int argc, char *argv[])\r
 {\r
-       byte *mesg=malloc(sizeof(dword));\r
-\r
-       if(argv[1]) bakapee = atoi(argv[1]);\r
-       else bakapee = 1;\r
+       static global_game_variables_t gvar;\r
+       char *bakapee1,*bakapee1p;\r
+//     sword bakapee;\r
+//     if(argv[1]) bakapee = atoi(argv[1]);\r
+//     else bakapee = 1;\r
 \r
        Startup16(&gvar);\r
 \r
-       pan.pn=1;\r
+       bakapee1=malloc(64);\r
+       bakapee1p=malloc(64);\r
 \r
-       /* create the map */\r
-       fprintf(stderr, "testing map load~      ");\r
-       loadmap("data/test.map", &map);\r
-       chkmap(&map, 0);\r
-       printf("chkmap ok       ");\r
-       fprintf(stderr, "yay map loaded~~\n");\r
+       if (argc < 2) {\r
+               //fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");\r
+               bakapee1 =              FILENAME_1;\r
+               bakapee1p =     FILENAME_1P;\r
 \r
-       /* draw the tiles */\r
-       ptr = map.data;\r
-       //mappalptr = map.tiles->btdata->palette;\r
+       }else{\r
+               if(argv[1]) bakapee1 = argv[1];\r
+               if(argv[2]) bakapee1p = argv[2];\r
+       }\r
+\r
+       // OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
+       //IN CA i think you use CAL_SetupGrFile but i do think we should work together on this part --sparky4\r
+       //----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
-       /* data */\r
-       if(CA_LoadFile("data/spri/chikyuu.vrs", &(player[0].gr), &gvar)) baka=1; else baka=0;\r
+       // create the map\r
+//     fprintf(stderr, "testing map load~      ");\r
+       CA_loadmap("data/test.map", &map, &gvar);\r
+       chkmap(&map, 0);\r
+//     initMap(&map);\r
+//     printf("chkmap ok       ");\r
+//     fprintf(stderr, "yay map loaded~~\n");\r
 \r
-       /* create the planar buffer */\r
-////++++       (player[0].data) = *planar_buf_from_bitmap(&p);\r
-       /*++++printf("load pee!!        ");\r
-       pp = planar_buf_from_bitmap(&p);\r
-       printf("done!\n");*/\r
+       // data\r
+       VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
 \r
-       /*      input!  */\r
-       IN_Default(0,&player,ctrl_Joystick);\r
-       //IN_Default(1,&player,ctrl_Joystick);\r
+       // input!\r
+       IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
 \r
-       /* save the palette */\r
-       dpal = modexNewPal();\r
-       modexPalSave(dpal);\r
-       modexFadeOff(4, dpal);\r
+       // save the palette\r
+#ifdef FADE\r
+       modexPalSave(&gvar.video.dpal);\r
+       modexFadeOff(4, &gvar.video.dpal);\r
+       modexPalBlack();\r
+#endif\r
 \r
-       textInit();\r
-       VGAmodeX(bakapee, 1, &gvar);\r
-//     printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);\r
-       modexPalBlack();        //reset the palette~\r
+       VGAmodeX(1/*bakapee*/, 1, &gvar);\r
 \r
-//     printf("Total used @ before palette initiation:         %zu\n", oldfreemem-GetFreeSize());\r
-//++++ player[0].data.offset=(paloffset/3);\r
-//++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);\r
-               modexPalUpdate1(player[0].data->palette);\r
-//++++0000             modexPalUpdate1(map.tiles->btdata->palette);\r
-       //printf("      %d\n", sizeof(ptmp->data));\r
+       /* load color palette */\r
+       /*ptmp.offset=(paloffset/3);\r
+       modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
+       //modexClearRegion(bg->page, 0, 0, 320, 240, 255);\r
+       //printf("      %d\n", sizeof(ptmp.data));\r
        //printf("1:    %d\n", paloffset);\r
-//++++ map.tiles->data->offset=(paloffset/3);\r
-       //XTmodexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
-//     printf("\n====\n");\r
-//     printf("0       paloffset=      %d\n", paloffset/3);\r
-//     printf("====\n\n");\r
-\r
-       gpal = modexNewPal();\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
-       modexPalBlack();        //so player will not see loadings~\r
+       map.tiles->data->offset=(paloffset/3);\r
+       modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
+       VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
+       //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
+\r
+#ifdef FADE\r
+       modexPalSave(&gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", &gvar.video.palette);\r
+       modexPalBlack();        //so gvar.player will not see loadings~\r
+#endif\r
 \r
-       /* setup camera and screen~ */\r
+       // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       for(i=0;i<gvar.video.num_of_pages;i++)\r
-       {\r
-               mv[i].page = &gvar.video.page[i];\r
-               mv[i].map = &map;\r
-               mv[i].video = &gvar.video;\r
-               mv[i].pan       = &pan;\r
-       }\r
+       ZC_MVSetup(&gvar.mv, &map, &gvar);\r
 \r
-       /* set up paging */\r
+       // set up paging\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
-       mapGoTo(mv, 0, 0);\r
-       //_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);\r
+       mapGoTo(&gvar.mv, 0, 0);\r
 \r
-       //TODO: put player in starting position of spot\r
-       //default player position on the viewable map\r
-       player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;\r
-       player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;\r
-       IN_initplayer(&player, 0);\r
-       //IN_initplayer(&player, 1);\r
-\r
-#ifndef        SPRITE\r
-       modexClearRegion(mv[0].page, player[0].x, player[0].y-TILEWH, 16, 32, 15);\r
-       //modexClearRegion(mv[1].page, player[0].x, player[0].y-TILEWH, 16, 32, 15);\r
-#else\r
-       //PBUFSFUN(mv[1].page, player[0].x, player[0].y-TILEWH, 16, 64, 24, 32, PLAYERBMPDATA);\r
-       PBUFSFUN(mv[0].page, player[0].x, player[0].y-TILEWH, 16, 64, 16, 32,   player[0].data);\r
+       ZC_PlayerXYpos(0, 0, &gvar.player, &gvar.mv, 0, 1);\r
+       EN_initPlayer(&gvar.player[0], &gvar.video);\r
+       //print_anim_ids(gvar.player[0].enti.spri);\r
+       if (gvar.video.sprifilei == -1)\r
+       {\r
+#ifdef FADE\r
+               modexFadeOff(4, &gvar.video.palette);\r
 #endif\r
+               Quit(&gvar, "Wrong ID for sprite");\r
+#ifdef FADE\r
+               modexFadeOn(4, &gvar.video.dpal);\r
+#endif\r
+       }\r
 \r
-       if(!pageflipflop)       modexShowPage(mv[1].page);\r
-       else                    modexShowPage(mv[0].page);//!(gvar.video.p)\r
-               shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.\r
-\r
-       /* buffer pages */\r
-//     modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47);\r
-//     modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 45);\r
-//     {\r
-//             unsigned int k,j,o;\r
-//             /* fill screen with a distinctive pattern */\r
-//             for (k=0;k < vga_state.vga_width;k++) {\r
-//                     o = k >> 2;\r
-//                     vga_write_sequencer(0x02/*map mask*/,1 << (k&3));\r
-//                             for (j=0;j < vga_state.vga_height;j++,o += vga_state.vga_stride)\r
-//                                     vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!\r
-//             }\r
-//     }\r
-       modexClearRegion(mv[3].page, 0, 128, 24, 36, 15);\r
-\r
-       modexFadeOn(4, gpal);\r
-       while(!IN_KeyDown(sc_Escape) && player[0].hp>0)\r
+//     while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }\r
+       gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
+       gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
+       shinku(&gvar);\r
+//modexpdump(gvar.mv[0].page);\r
+#ifdef FADE\r
+       modexFadeOn(4, &gvar.video.palette);\r
+#endif\r
+       while(!IN_KeyDown(sc_Escape) && gvar.player[0].enti.hp>0)\r
        {\r
+               gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
+               gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
                shinku(&gvar);\r
-       //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
-       //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction\r
-       //when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map\r
-\r
-       //player movement\r
-               IN_ReadControl(0,&player);\r
-       if(!panswitch){\r
-               walk(mv, player, 0);\r
-       }else{\r
-               panpagemanual(mv, player, 0);\r
-               //printf("      player[0].q: %d", player[0].q); printf("        player[0].d: %d\n", player[0].d);\r
-       }\r
+               //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
+               //to stop scrolling and have the gvar.player position data move to the edge of the screen with respect to the direction\r
+               //when gvar.player[0].tx or gvar.player[0].ty == 0 or gvar.player[0].tx == 20 or gvar.player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map\r
+\r
+               //gvar.player movement\r
+               IN_ReadControl(&gvar.player[0], &gvar);\r
+               if(!panswitch){\r
+                       //ZC_walk2(gvar.player[0].ent, mv);\r
+                       ZC_walk(&gvar.mv, &gvar.player, 0);\r
+               }else{\r
+                       TAIL_PANKEYFUNZC;\r
+                       //printf("      gvar.player[0].enti.q: %d", gvar.player[0].enti.q);     printf("        gvar.player[0].d: %d\n", gvar.player[0].d);\r
+               }\r
 \r
-       //the scripting stuff....\r
-       //if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))\r
-       if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))\r
-       {\r
-               short i;\r
-               for(i=800; i>=400; i--)\r
+               //the scripting stuff....\r
+               //if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
+               if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
                {\r
-                       sound(i);\r
+                       short i;\r
+                       for(i=800; i>=400; i--)\r
+                       {\r
+                               sound(i);\r
+                       }\r
+                       nosound();\r
                }\r
-               nosound();\r
-       }\r
-       if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }\r
-       //debugging binds!\r
-       if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }\r
-       if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; }\r
-       if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; }\r
-       if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; }\r
-       if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);\r
-                IN_UserInput(1,1);\r
-       }       //p\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(22)){\r
-       paloffset=0; modexPalBlack(); modexPalUpdate(player[0].data, &paloffset, 0, 0);\r
-       printf("2paloffset      =       %d\n", paloffset/3);\r
-        modexpdump(mv[0].page); modexpdump(mv[1].page);\r
-               IN_UserInput(1,1);\r
-       }\r
+               if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }\r
+               //debugging binds!\r
 \r
-       //pan switch\r
-       if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}    //f12\r
-       if(IN_KeyDown(87))      //f11\r
-       {\r
-               pageflipflop=!pageflipflop;\r
-               IN_UserInput(1,1);\r
-//             VGAmodeX(0, 0, &gvar);\r
-//             IN_Shutdown();\r
-//             __asm\r
-//             {\r
-//                     mov ah,31h\r
-//                     int 21h\r
-//             }\r
-       }\r
-       if(IN_KeyDown(68))      //f10\r
-       {\r
-               gvar.kurokku.fpscap=!gvar.kurokku.fpscap;\r
-               IN_UserInput(1,1);\r
-       }\r
-       if(IN_KeyDown(67))      //f9\r
-       {\r
-               modexClearRegion(mv[1].page, 0, 0, mv[1].page->width, mv[1].page->height, 2);\r
-               modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 3);\r
-               modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 4);\r
-               modexClearRegion(mv[3].page, 0, 0, 20, 36, 15);\r
-               //IN_UserInput(1,1);\r
-       }\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
-       }\r
-       //TODO fmemtest into page\r
-       /*if(IN_KeyDown(4+1))   //4\r
-       {\r
-               pg=1;\r
-               SELECT_ALL_PLANES();\r
-               _fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4);\r
-       }*/\r
+               if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o\r
+               if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u\r
+\r
+               TAIL_FUNCTIONKEYFUNCTIONS\r
+               TAIL_FUNCTIONKEYDRAWJUNK\r
+               if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }\r
+               if(IN_KeyDown(sc_J) || IN_KeyDown(sc_K))\r
+               {\r
+                       if(IN_KeyDown(sc_J))\r
+                       {\r
+                               bakapee1=FILENAME_1;\r
+                               bakapee1p=FILENAME_1P;\r
+                               gvar.player[0].enti.overdraww=0;\r
+                       }\r
+                       if(IN_KeyDown(sc_K))\r
+                       {\r
+                               bakapee1=FILENAME_2;\r
+                               bakapee1p=FILENAME_2P;\r
+                               gvar.player[0].enti.overdraww=2;\r
+                       }\r
+                       //read_vrs(&gvar, bakapee1, gvar.player[0].enti.spri->spritesheet);\r
+                       VRS_ReadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
+                       VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
+               }//JK\r
+#ifdef FADE\r
+               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }\r
+#endif\r
+               if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
 \r
-       //9\r
-       if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
-       //if(IN_KeyDown(11)){ modexPalOverscan(15); }\r
-       if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!\r
+               if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break;   //incase things go out of sync!\r
        }\r
 \r
        /* fade back to text mode */\r
        /* but 1st lets save the game palette~ */\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
-       modexFadeOff(4, gpal);\r
-       VGAmodeX(0, 1, &gvar);\r
+#ifdef FADE\r
+       modexPalSave(&gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", &gvar.video.palette);\r
+       modexFadeOff(4, &gvar.video.palette);\r
+#endif\r
        Shutdown16(&gvar);\r
-       printf("\nProject 16 scroll.exe. This is just a test file!\n");\r
+       printf("\nProject 16 zcroll.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
-       printf("tx: %d  ", mv[0].tx);\r
-       printf("ty: %d\n", mv[0].ty);\r
-       printf("\n");\r
-       printf("player vars:\n");\r
-       printf("        x: %d", player[0].x); printf("  y: %d\n", player[0].y);\r
-       //if(player[0].hp==0) printf("%d wwww\n", player[0].y+8);\r
-       //else printf("\nplayer[0].y: %d\n", player[0].y);\r
-       printf("        tx: %d", player[0].tx); printf("        ty: %d\n", player[0].ty);\r
-       printf("        triggx: %d", player[0].triggerx); printf("      triggy: %d\n", player[0].triggery);\r
-       printf("        hp: %d", (player[0].hp));       printf("        q: %d", player[0].q);   printf("        player.info.dir: %d", player[0].info.dir);      printf("        player.d: %d ", player[0].d);\r
-               printf("        pdir=%d\n", player[0].pdir);\r
-       printf("        tile data value at player trigger position: %d\n\n", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);\r
-       printf("Virtual Screen: %dx", gvar.video.page[0].width);        printf("%d      ", gvar.video.page[0].height);\r
-       printf("Screen: %dx", gvar.video.page[0].sw);   printf("%d\n", gvar.video.page[0].sh);\r
-       printf("virtual tile resolution: %dx", gvar.video.page[0].tilesw);      printf("%d      ", gvar.video.page[0].tilesh);\r
-       printf("tile resolution: %dx", gvar.video.page[0].tw);  printf("%d\n", gvar.video.page[0].th);\r
-       printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);      printf("%d\n", gvar.video.page[0].tilemidposscreeny);\r
-       modexprintmeminfo(&gvar.video);\r
-       //printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("      mv[%u].ty: %d   ", pan.pn, mv[pan.pn].ty);\r
-       printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);\r
-       printf("pageflipflop=%u\n", pageflipflop);\r
-       //0000printf("\ngvar.video.tickclk=%f\n", gvar.video.tickclk);\r
-       //0000printf("gvar.video.clk=%f", gvar.video.clk);\r
-       printf("\n");\r
-       //printf("map.width=%d  map.height=%d   map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);\r
-\r
-       printf("\n");\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
-       modexFadeOn(4, dpal);\r
+       SCROLLEXITMESG;\r
+       WCPU_cpufpumesg();\r
+#ifdef FADE\r
+       modexFadeOn(4, gvar.video.dpal);\r
+#endif\r
 }\r