OSDN Git Service

updated copyleft and need to test and fix newer version of open watcom
[proj16/16.git] / src / lib / 16_tail.c
index bfa8446..1824789 100755 (executable)
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -20,7 +20,7 @@
  *\r
  */\r
 /*\r
- * 16 library\r
+ * 16 tail library\r
  */\r
 \r
 #include "src/lib/16_tail.h"\r
 ==========================\r
 */\r
 \r
-void Startup16(global_game_variables_t *gvar)\r
+void Startup16 (global_game_variables_t *gvar)\r
 {\r
-#ifdef __WATCOMC__\r
-       start_timer(gvar);\r
-\r
-       // DOSLIB: check our environment\r
-       probe_dos();\r
-\r
-       // DOSLIB: what CPU are we using?\r
-       // NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.\r
-       //        So this code by itself shouldn't care too much what CPU it's running on. Except that other\r
-       //        parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for\r
-       //        the CPU to carry out tasks. --J.C.\r
-       cpu_probe();\r
-\r
-       // DOSLIB: check for VGA\r
-       if (!probe_vga()) {\r
-               printf("VGA probe failed\n");\r
-               return;\r
-       }\r
-       // hardware must be VGA or higher!\r
-       if (!(vga_state.vga_flags & VGA_IS_VGA)) {\r
-               printf("This program requires VGA or higher graphics hardware\n");\r
-               return;\r
-       }\r
-\r
-       if (_DEBUG_INIT() == 0) {\r
-#ifdef DEBUGSERIAL\r
-               //printf("WARNING: Failed to initialize DEBUG output\n");\r
-#endif\r
-       }\r
-       _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log\r
-       _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r
-\r
-       textInit();\r
-#endif\r
+       gvar->video.VL_Started=0;\r
+       TL_VidInit(gvar);\r
        gvar->mm.mmstarted=0;\r
        gvar->pm.PMStarted=0;\r
-       MM_Startup(gvar);\r
+       StartupCAMMPM(gvar);\r
 #ifdef __WATCOMC__\r
 #ifdef __DEBUG_InputMgr__\r
        if(!dbg_nointest)\r
 #endif\r
        IN_Startup(gvar);\r
 #endif\r
-       PM_Startup(gvar);\r
-       PM_UnlockMainMem(gvar);\r
-       CA_Startup(gvar);\r
 }\r
 \r
 //===========================================================================\r
@@ -98,20 +63,188 @@ void Startup16(global_game_variables_t *gvar)
 ==========================\r
 */\r
 \r
-void Shutdown16(global_game_variables_t *gvar)\r
+void Shutdown16 (global_game_variables_t *gvar)\r
 {\r
-       PM_Shutdown(gvar);\r
 #ifdef __WATCOMC__\r
 #ifdef __DEBUG_InputMgr__\r
        if(!dbg_nointest)\r
 #endif\r
        IN_Shutdown(gvar);\r
 #endif\r
+       ShutdownCAMMPM(gvar);\r
+#ifdef __WATCOMC__\r
+       if(gvar->video.VL_Started)\r
+               VL_Shutdown (gvar);//VGAmodeX(0, 1, gvar);\r
+#endif\r
+}\r
+\r
+//===========================================================================\r
+\r
+/*\r
+==========================\r
+=\r
+= StartupCAMMPM\r
+=\r
+==========================\r
+*/\r
+\r
+void StartupCAMMPM (global_game_variables_t *gvar)\r
+{\r
+/*\r
+       MM_Startup ();                  // so the signon screen can be freed\r
+\r
+       SignonScreen ();\r
+\r
+       VW_Startup ();\r
+       IN_Startup ();\r
+       PM_Startup ();\r
+       PM_UnlockMainMem ();\r
+       SD_Startup ();\r
+       CA_Startup ();\r
+       US_Startup ();\r
+*/\r
+       MM_Startup(gvar);\r
+#ifdef __16_PM__\r
+       PM_Startup(gvar);\r
+//???? PM_CheckMainMem(gvar);\r
+       PM_UnlockMainMem(gvar);\r
+#endif\r
+       CA_Startup(gvar);\r
+}\r
+\r
+//===========================================================================\r
+\r
+/*\r
+==========================\r
+=\r
+= ShutdownCAMMPM\r
+=\r
+==========================\r
+*/\r
+\r
+void ShutdownCAMMPM (global_game_variables_t *gvar)\r
+{\r
+/*\r
+       US_Shutdown ();\r
+       SD_Shutdown ();\r
+       PM_Shutdown ();\r
+       IN_Shutdown ();\r
+       VW_Shutdown ();\r
+       CA_Shutdown ();\r
+       MM_Shutdown ()\r
+*/\r
+#ifdef __16_PM__\r
+       PM_Shutdown(gvar);\r
+#endif\r
        CA_Shutdown(gvar);\r
        MM_Shutdown(gvar);\r
-       VGAmodeX(0, 1, gvar);\r
 }\r
 \r
+//===========================================================================\r
+\r
+////////////////////////////////////////////////////////////////////\r
+//\r
+// HANDLE INTRO SCREEN (SYSTEM CONFIG)\r
+//\r
+////////////////////////////////////////////////////////////////////\r
+void MU_IntroScreen(global_game_variables_t *gvar)\r
+{\r
+#define MAINCOLOR      0x6c\r
+#define EMSCOLOR       0x6c\r
+#define XMSCOLOR       0x6c\r
+\r
+#define FILLCOLOR      14\r
+\r
+       long memory,emshere,xmshere;\r
+       int i,num,ems[10]={100,200,300,400,500,600,700,800,900,1000},\r
+               xms[10]={100,200,300,400,500,600,700,800,900,1000},\r
+               main[10]={32,64,96,128,160,192,224,256,288,320};\r
+\r
+       gvar->video.print.t=1;\r
+       gvar->video.print.tlsw=1;\r
+       gvar->video.print.bgcolor=8;\r
+       gvar->video.print.color=5;\r
+\r
+       //\r
+       // DRAW MAIN MEMORY\r
+       //\r
+       num=32;\r
+       gvar->video.print.x=49-32;\r
+\r
+       memory=(1023l+gvar->mmi.nearheap+gvar->mmi.farheap)/1024l;\r
+       for (i=0;i<10;i++)\r
+               if (memory>=main[i])\r
+               {\r
+                       gvar->video.print.y=163-8*i;\r
+                       sprintf(global_temp_status_text, "% 4u", num); VL_print(global_temp_status_text, 0, gvar);\r
+                       VL_Bar(49,163-8*i,6,5,MAINCOLOR-i,gvar);\r
+                       num+=32;\r
+               }\r
+       gvar->video.print.y=171;\r
+       VL_print("MAIN", 0, gvar);\r
+\r
+\r
+       //\r
+       // DRAW EMS MEMORY\r
+       //\r
+       if (gvar->pm.emm.EMSPresent)\r
+       {\r
+               num=100;\r
+               gvar->video.print.x=89-32;\r
+\r
+               emshere=4l*gvar->pm.emm.EMSPagesAvail;\r
+               for (i=0;i<10;i++)\r
+                       if (emshere>=ems[i])\r
+                       {\r
+                               gvar->video.print.y=163-8*i;\r
+                               sprintf(global_temp_status_text, "% 4u", num); VL_print(global_temp_status_text, 0, gvar);\r
+                               VL_Bar(89,163-8*i,6,5,EMSCOLOR-i,gvar);\r
+                               num+=100;\r
+                       }\r
+               gvar->video.print.y=171;\r
+               VL_print(" EMS", 0, gvar);\r
+       }\r
+\r
+       //\r
+       // DRAW XMS MEMORY\r
+       //\r
+       if (gvar->pm.xmm.XMSPresent)\r
+       {\r
+               num=100;\r
+               gvar->video.print.x=129-32;\r
+\r
+               xmshere=4l*gvar->pm.xmm.XMSPagesAvail;\r
+               for (i=0;i<10;i++)\r
+                       if (xmshere>=xms[i])\r
+                       {\r
+                               gvar->video.print.y=163-8*i;\r
+                               sprintf(global_temp_status_text, "% 4u", num); VL_print(global_temp_status_text, 0, gvar);\r
+                               VL_Bar(129,163-8*i,6,5,XMSCOLOR-i,gvar);\r
+                               num+=100;\r
+                       }\r
+               gvar->video.print.y=171;\r
+               VL_print(" XMS", 0, gvar);\r
+       }\r
+\r
+       //\r
+       // FILL BOXES\r
+       //\r
+       if (gvar->in.MousePresent)\r
+               VL_Bar(164,82,12,2,FILLCOLOR,gvar);\r
+\r
+       if (gvar->in.JoysPresent[0] || gvar->in.JoysPresent[1])\r
+               VL_Bar(164,105,12,2,FILLCOLOR,gvar);\r
+\r
+//++++ if (gvar->sd.AdLibPresent)//SB && !SoundBlasterPresent)\r
+//++++         VL_Bar(164,128,12,2,FILLCOLOR,gvar);\r
+\r
+//SB   if (SoundBlasterPresent)\r
+//SB           VL_Bar(164,151,12,2,FILLCOLOR,gvar);\r
+\r
+//SS   if (SoundSourcePresent)\r
+//SS           VL_Bar(164,174,12,2,FILLCOLOR,gvar);\r
+       IN_Ack (gvar);\r
+}\r
 \r
 //===========================================================================\r
 \r
@@ -122,29 +255,28 @@ void Shutdown16(global_game_variables_t *gvar)
 =\r
 ====================\r
 */\r
-\r
-/*void ReadConfig(void)\r
+#if 0\r
+void ReadConfig(void)\r
 {\r
        int                                      file;\r
-       SDMode            sd;\r
-       SMMode            sm;\r
-       SDSMode          sds;\r
+//     SDMode            sd;\r
+//     SMMode            sm;\r
+//     SDSMode          sds;\r
 \r
 \r
-       if ( (file = open(configname,O_BINARY | O_RDONLY)) != -1)\r
+       if ( (file = open(CONFIGNAME,O_BINARY | O_RDONLY)) != -1)\r
        {\r
        //\r
        // valid config file\r
        //\r
-               read(file,Scores,sizeof(HighScore) * MaxScores);\r
+//             read(file,Scores,sizeof(HighScore) * MaxScores);\r
 \r
-               read(file,&sd,sizeof(sd));\r
-               read(file,&sm,sizeof(sm));\r
-               read(file,&sds,sizeof(sds));\r
+//             read(file,&sd,sizeof(sd));\r
+//             read(file,&sm,sizeof(sm));\r
+//             read(file,&sds,sizeof(sds));\r
 \r
                read(file,&mouseenabled,sizeof(mouseenabled));\r
                read(file,&joystickenabled,sizeof(joystickenabled));\r
-               read(file,&joypadenabled,sizeof(joypadenabled));\r
                read(file,&joystickprogressive,sizeof(joystickprogressive));\r
                read(file,&joystickport,sizeof(joystickport));\r
 \r
@@ -158,7 +290,7 @@ void Shutdown16(global_game_variables_t *gvar)
 \r
                close(file);\r
 \r
-               if (sd == sdm_AdLib && !AdLibPresent && !SoundBlasterPresent)\r
+               /*if (sd == sdm_AdLib && !AdLibPresent && !SoundBlasterPresent)\r
                {\r
                        sd = sdm_PC;\r
                        sd = smm_Off;\r
@@ -166,7 +298,7 @@ void Shutdown16(global_game_variables_t *gvar)
 \r
                if ((sds == sds_SoundBlaster && !SoundBlasterPresent) ||\r
                        (sds == sds_SoundSource && !SoundSourcePresent))\r
-                       sds = sds_Off;\r
+                       sds = sds_Off;*/\r
 \r
                if (!MousePresent)\r
                        mouseenabled = false;\r
@@ -181,7 +313,7 @@ void Shutdown16(global_game_variables_t *gvar)
        //\r
        // no config file, so select by hardware\r
        //\r
-               if (SoundBlasterPresent || AdLibPresent)\r
+/*             if (SoundBlasterPresent || AdLibPresent)\r
                {\r
                        sd = sdm_AdLib;\r
                        sm = smm_AdLib;\r
@@ -197,13 +329,12 @@ void Shutdown16(global_game_variables_t *gvar)
                else if (SoundSourcePresent)\r
                        sds = sds_SoundSource;\r
                else\r
-                       sds = sds_Off;\r
+                       sds = sds_Off;*/\r
 \r
                if (MousePresent)\r
                        mouseenabled = true;\r
 \r
                joystickenabled = false;\r
-               joypadenabled = false;\r
                joystickport = 0;\r
                joystickprogressive = false;\r
 \r
@@ -214,7 +345,7 @@ void Shutdown16(global_game_variables_t *gvar)
        SD_SetMusicMode (sm);\r
        SD_SetSoundMode (sd);\r
        SD_SetDigiDevice (sds);\r
-}*/\r
+}\r
 \r
 \r
 /*\r
@@ -225,24 +356,23 @@ void Shutdown16(global_game_variables_t *gvar)
 ====================\r
 */\r
 \r
-/*void WriteConfig(void)\r
+void WriteConfig(void)\r
 {\r
        int                                      file;\r
 \r
-       file = open(configname,O_CREAT | O_BINARY | O_WRONLY,\r
+       file = open(CONFIGNAME,O_CREAT | O_BINARY | O_WRONLY,\r
                                S_IREAD | S_IWRITE | S_IFREG);\r
 \r
        if (file != -1)\r
        {\r
-               write(file,Scores,sizeof(HighScore) * MaxScores);\r
+//             write(file,Scores,sizeof(HighScore) * MaxScores);\r
 \r
-               write(file,&SoundMode,sizeof(SoundMode));\r
-               write(file,&MusicMode,sizeof(MusicMode));\r
-               write(file,&DigiMode,sizeof(DigiMode));\r
+//             write(file,&SoundMode,sizeof(SoundMode));\r
+//             write(file,&MusicMode,sizeof(MusicMode));\r
+//             write(file,&DigiMode,sizeof(DigiMode));\r
 \r
                write(file,&mouseenabled,sizeof(mouseenabled));\r
                write(file,&joystickenabled,sizeof(joystickenabled));\r
-               write(file,&joypadenabled,sizeof(joypadenabled));\r
                write(file,&joystickprogressive,sizeof(joystickprogressive));\r
                write(file,&joystickport,sizeof(joystickport));\r
 \r
@@ -251,12 +381,134 @@ void Shutdown16(global_game_variables_t *gvar)
                write(file,&buttonmouse,sizeof(buttonmouse));\r
                write(file,&buttonjoy,sizeof(buttonjoy));\r
 \r
-               write(file,&viewsize,sizeof(viewsize));\r
+//             write(file,&viewsize,sizeof(viewsize));\r
                write(file,&mouseadjustment,sizeof(mouseadjustment));\r
 \r
                close(file);\r
        }\r
-}*/\r
+}\r
+#endif\r
+//===========================================================================\r
+\r
+/*\r
+===================\r
+=\r
+= FizzleFade\r
+=\r
+===================\r
+*/\r
+\r
+boolean FizzleFade (unsigned source, unsigned dest, unsigned width, unsigned height, unsigned frames, boolean abortable, global_game_variables_t *gvar)\r
+{\r
+       word            p,pixperframe;\r
+       unsigned        drawofs,pagedelta;\r
+       byte            mask,maskb[8] = {1,2,4,8};\r
+       unsigned        x,y,frame;\r
+       long            rndval;\r
+       word            screenseg;\r
+#ifdef __WATCOMC__\r
+       unsigned        esorig;//,q;\r
+#endif\r
+\r
+       pagedelta = dest-source;\r
+       rndval = 1;\r
+#ifdef __WATCOMC__\r
+       esorig = 0;// q = 16;\r
+#endif\r
+       x = y = 0;\r
+       pixperframe = (dword)(gvar->video.page[0].width*gvar->video.page[0].height)/frames;\r
+       screenseg = SCREENSEG;\r
+\r
+       IN_StartAck (gvar);\r
+\r
+//     modexClearRegion(&(gvar->video.page[0]), 0, 0, gvar->video.page[0].width, gvar->video.page[0].height, 0);\r
+//     modexClearRegion(&(gvar->video.page[1]), 0, 0, gvar->video.page[0].width, gvar->video.page[0].height, 15);\r
+\r
+#ifdef __WATCOMC__\r
+       __asm {\r
+               mov     [esorig],es\r
+       }\r
+#endif\r
+//     TimeCount=\r
+       frame=0;\r
+       do      // while (1)\r
+       {\r
+               if (abortable && IN_CheckAck (gvar) )\r
+                       return true;\r
+\r
+               __asm {\r
+                       mov     es,[screenseg]\r
+               }\r
+\r
+               for (p=0;p<pixperframe;p++)\r
+               {\r
+                       __asm {\r
+                               //\r
+                               // seperate random value into x/y pair\r
+                               //\r
+                               mov     ax,[WORD PTR rndval]\r
+                               mov     dx,[WORD PTR rndval+2]\r
+                               mov     bx,ax\r
+                               dec     bl\r
+                               mov     [BYTE PTR y],bl                 // low 8 bits - 1 = y xoordinate\r
+                               mov     bx,ax\r
+                               mov     cx,dx\r
+                               mov     [BYTE PTR x],ah                 // next 9 bits = x xoordinate\r
+                               mov     [BYTE PTR x+1],dl\r
+                               //\r
+                               // advance to next random element\r
+                               //\r
+                               shr     dx,1\r
+                               rcr     ax,1\r
+                               jnc     noxor\r
+                               xor     dx,0x0001\r
+                               xor     ax,0x2000\r
+#ifdef __BORLANDC__\r
+                       }\r
+#endif\r
+noxor:\r
+#ifdef __BORLANDC__\r
+                       __asm {\r
+#endif\r
+                               mov     [WORD PTR rndval],ax\r
+                               mov     [WORD PTR rndval+2],dx\r
+                       }\r
+\r
+                       if (x>width || y>height)\r
+//                     if ((x>width || y>height) && (x<width*2 && y<height*2))\r
+                               continue;\r
+//                     drawofs = source+(gvar->video.ofs.ylookup[y]) + (x>>2);\r
+                       drawofs = source+(y*gvar->video.page[0].stridew) + (x>>2);\r
+\r
+                       //\r
+                       // copy one pixel\r
+                       //\r
+                       mask = x&3;\r
+                       VGAREADMAP(mask);\r
+                       mask = maskb[mask];\r
+                       VGAMAPMASK(mask);\r
+\r
+                       __asm {\r
+                               mov     di,[drawofs]\r
+                               mov     al,[es:di]\r
+                               add     di,[pagedelta]\r
+                               mov     [es:di],al\r
+                       }\r
+\r
+                       if (rndval == 1)                // entire sequence has been completed\r
+                               return false;\r
+               }\r
+               frame++;\r
+//--           while (TimeCount<frame){}//;            // don't go too fast\r
+               delay(1);\r
+       } while (1);\r
+#ifdef __WATCOMC__\r
+       __asm {\r
+               mov     es,[esorig]\r
+       }\r
+       return false;\r
+#endif\r
+}\r
 \r
 //===========================================================================\r
 \r
@@ -298,9 +550,131 @@ void DebugMemory_(global_game_variables_t *gvar, boolean q)
 #ifdef __WATCOMC__\r
        //IN_Ack ();\r
 #endif\r
-       if(q) MM_ShowMemory (gvar);\r
+//     if(q) MM_ShowMemory (gvar);\r
+}\r
+\r
+/*\r
+===================\r
+=\r
+= TestSprites\r
+=\r
+===================\r
+*/\r
+\r
+#if 0\r
+#define DISPWIDTH      110\r
+#define        TEXTWIDTH   40\r
+void TestSprites(void)\r
+{\r
+       int hx,hy,sprite,oldsprite,bottomy,topx,shift;\r
+       spritetabletype far *spr;\r
+       spritetype _seg *block;\r
+       unsigned        mem,scan;\r
+\r
+\r
+       VW_FixRefreshBuffer ();\r
+       US_CenterWindow (30,17);\r
+\r
+       US_CPrint ("Sprite Test");\r
+       US_CPrint ("-----------");\r
+\r
+       hy=PrintY;\r
+       hx=(PrintX+56)&(~7);\r
+       topx = hx+TEXTWIDTH;\r
+\r
+       US_Print ("Chunk:\nWidth:\nHeight:\nOrgx:\nOrgy:\nXl:\nYl:\nXh:\nYh:\n"\r
+                         "Shifts:\nMem:\n");\r
+\r
+       bottomy = PrintY;\r
+\r
+       sprite = STARTSPRITES;\r
+       shift = 0;\r
+\r
+       do\r
+       {\r
+               if (sprite>=STARTTILE8)\r
+                       sprite = STARTTILE8-1;\r
+               else if (sprite<STARTSPRITES)\r
+                       sprite = STARTSPRITES;\r
+\r
+               spr = &spritetable[sprite-STARTSPRITES];\r
+               block = (spritetype _seg *)grsegs[sprite];\r
+\r
+               VL_Bar (hx,hy,TEXTWIDTH,bottomy-hy,WHITE);\r
+\r
+               PrintX=hx;\r
+               PrintY=hy;\r
+               US_PrintUnsigned (sprite);US_Print ("\n");PrintX=hx;\r
+               US_PrintUnsigned (spr->width);US_Print ("\n");PrintX=hx;\r
+               US_PrintUnsigned (spr->height);US_Print ("\n");PrintX=hx;\r
+               US_PrintSigned (spr->orgx);US_Print ("\n");PrintX=hx;\r
+               US_PrintSigned (spr->orgy);US_Print ("\n");PrintX=hx;\r
+               US_PrintSigned (spr->xl);US_Print ("\n");PrintX=hx;\r
+               US_PrintSigned (spr->yl);US_Print ("\n");PrintX=hx;\r
+               US_PrintSigned (spr->xh);US_Print ("\n");PrintX=hx;\r
+               US_PrintSigned (spr->yh);US_Print ("\n");PrintX=hx;\r
+               US_PrintSigned (spr->shifts);US_Print ("\n");PrintX=hx;\r
+               if (!block)\r
+               {\r
+                       US_Print ("-----");\r
+               }\r
+               else\r
+               {\r
+                       mem = block->sourceoffset[3]+5*block->planesize[3];\r
+                       mem = (mem+15)&(~15);           // round to paragraphs\r
+                       US_PrintUnsigned (mem);\r
+               }\r
+\r
+               oldsprite = sprite;\r
+               do\r
+               {\r
+               //\r
+               // draw the current shift, then wait for key\r
+               //\r
+                       VL_Bar(topx,hy,DISPWIDTH,bottomy-hy,WHITE);\r
+                       if (block)\r
+                       {\r
+                               PrintX = topx;\r
+                               PrintY = hy;\r
+                               US_Print ("Shift:");\r
+                               US_PrintUnsigned (shift);\r
+                               US_Print ("\n");\r
+                               VWB_DrawSprite (topx+16+shift*2,PrintY,sprite);\r
+                       }\r
+\r
+                       VW_UpdateScreen();\r
+\r
+                       scan = IN_WaitForKey ();\r
+\r
+                       switch (scan)\r
+                       {\r
+                       case sc_UpArrow:\r
+                               sprite++;\r
+                               break;\r
+                       case sc_DownArrow:\r
+                               sprite--;\r
+                               break;\r
+                       case sc_LeftArrow:\r
+                               if (--shift == -1)\r
+                                       shift = 3;\r
+                               break;\r
+                       case sc_RightArrow:\r
+                               if (++shift == 4)\r
+                                       shift = 0;\r
+                               break;\r
+                       case sc_Escape:\r
+                               return;\r
+                       }\r
+\r
+               } while (sprite == oldsprite);\r
+\r
+  } while (1);\r
+\r
+\r
 }\r
 \r
+#endif\r
+\r
 /*\r
 ==========================\r
 =\r
@@ -311,8 +685,10 @@ void DebugMemory_(global_game_variables_t *gvar, boolean q)
 \r
 void ClearMemory (global_game_variables_t *gvar)\r
 {\r
+#ifdef __16_PM__\r
        PM_UnlockMainMem(gvar);\r
-       //snd\r
+#endif\r
+       //sd\r
        MM_SortMem (gvar);\r
 }\r
 \r
@@ -373,10 +749,7 @@ void Quit (global_game_variables_t *gvar, char *error)
 \r
 //===========================================================================\r
 \r
-#ifndef __WATCOMC__\r
-char global_temp_status_text[512];\r
-char global_temp_status_text2[512];\r
-#else\r
+#ifdef __WATCOMC__\r
 //\r
 // for mary4 (XT)\r
 // this is from my XT's BIOS\r
@@ -385,98 +758,37 @@ char global_temp_status_text2[512];
 void turboXT(byte bakapee)\r
 {\r
        __asm {\r
-       push    ax\r
-       push    bx\r
-       push    cx\r
-       in      al, 61h                         //; Read equipment flags\r
-       xor     al, bakapee                     //;   toggle speed\r
-       out     61h, al                         //; Write new flags back\r
-\r
-       mov     bx, 0F89h                       //; low pitch blip\r
-       and     al, 4                           //; Is turbo mode set?\r
-       jz      @@do_beep\r
-       mov     bx, 52Eh                        //; high pitch blip\r
-\r
-@@do_beep:\r
-       mov     al, 10110110b           //; Timer IC 8253 square waves\r
-       out     43h, al                         //;   channel 2, speaker\r
-       mov     ax, bx\r
-       out     42h, al                         //;   send low order\r
-       mov     al, ah                          //;   load high order\r
-       out     42h, al                         //;   send high order\r
-       in      al, 61h                         //; Read IC 8255 machine status\r
-       push    ax\r
-       or      al, 00000011b\r
-       out     61h, al                         //; Turn speaker on\r
-       mov     cx, 2000h\r
-@@delay:\r
-       loop    @@delay\r
-       pop     ax\r
-       out     61h, al                         //; Turn speaker off\r
-       pop     cx\r
-       pop     bx\r
-       pop     ax\r
+               push    ax\r
+               push    bx\r
+               push    cx\r
+               in      al, 61h                         //; Read equipment flags\r
+               xor     al, bakapee                     //;   toggle speed\r
+               out     61h, al                         //; Write new flags back\r
+\r
+               mov     bx, 0F89h                       //; low pitch blip\r
+               and     al, 4                           //; Is turbo mode set?\r
+               jz      @@do_beep\r
+               mov     bx, 52Eh                        //; high pitch blip\r
+\r
+       @@do_beep:\r
+               mov     al, 10110110b           //; Timer IC 8253 square waves\r
+               out     43h, al                         //;   channel 2, speaker\r
+               mov     ax, bx\r
+               out     42h, al                         //;   send low order\r
+               mov     al, ah                          //;   load high order\r
+               out     42h, al                         //;   send high order\r
+               in      al, 61h                         //; Read IC 8255 machine status\r
+               push    ax\r
+               or      al, 00000011b\r
+               out     61h, al                         //; Turn speaker on\r
+               mov     cx, 2000h\r
+       @@delay:\r
+               loop    @@delay\r
+               pop     ax\r
+               out     61h, al                         //; Turn speaker off\r
+               pop     cx\r
+               pop     bx\r
+               pop     ax\r
        }\r
 }\r
 #endif\r
-\r
-const char *word_to_binary(word x)\r
-{\r
-       static char b[17];\r
-       int z;\r
-\r
-       b[0] = '\0';\r
-       for (z = 16; z > 0; z >>= 1)\r
-       {\r
-               strcat(b, ((x & z) == z) ? "1" : "0");\r
-       }\r
-       return b;\r
-}\r
-\r
-const char *nibble_to_binary(nibble x)\r
-{\r
-       static char b[9];\r
-       int z;\r
-\r
-       b[0] = '\0';\r
-       for (z = 8; z > 0; z >>= 1)\r
-       {\r
-               strcat(b, ((x & z) == z) ? "1" : "0");\r
-       }\r
-       return b;\r
-}\r
-\r
-const char *boolean_to_binary(boolean x)\r
-{\r
-       static char b[9];\r
-       int z;\r
-\r
-       b[0] = '\0';\r
-       for (z = 1; z > 0; z >>= 1)\r
-       {\r
-               strcat(b, ((x & z) == z) ? "1" : "0");\r
-       }\r
-       return b;\r
-}\r
-\r
-void nibbletest()\r
-{\r
-       nibble pee;\r
-       printf("nibbletest\n");\r
-       /* nibble to binary string */\r
-       for(pee=0;pee<18;pee++)\r
-               printf("        %u %s\n", pee, nibble_to_binary(pee));\r
-       printf("        sizeof(nibble)=%s\n", nibble_to_binary(sizeof(nibble)));\r
-       printf("end of nibble test\n");\r
-}\r
-\r
-void booleantest()\r
-{\r
-       boolean pee;\r
-       printf("booleantest\n");\r
-       /* boolean to binary string */\r
-       for(pee=0;pee<4;pee++)\r
-               printf("        %u %s\n", pee, boolean_to_binary(pee));\r
-       printf("        sizeof(boolean)=%s\n", boolean_to_binary(sizeof(boolean)));\r
-       printf("end of boolean test\n");\r
-}\r