modified: src/lib/16_ca.c

	modified:   src/lib/16_ca.h
	modified:   src/lib/16_head.c
	modified:   src/lib/16_head.h

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index bacb7181c155ae93232dfda2c69423aa478553bd..29df8f63d634516031dd1f9e672a7fe43912f415 100644 (file)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -30,14 +30,10 @@ loaded into the data segment
 =============================================================================\r
 */\r
 \r
-#include "ID_HEADS.H"\r
-#pragma hdrstop\r
-#include "ID_STRS.H"\r
+#include "src/lib/16_head.h"\r
+//#include "ID_STRS.H"\r
 \r
-#pragma warn -pro\r
-#pragma warn -use\r
-\r
-#define THREEBYTEGRSTARTS\r
+//#define THREEBYTEGRSTARTS\r
 \r
 /*\r
 =============================================================================\r
@@ -53,12 +49,12 @@ typedef struct
 } huffnode;\r
 \r
 \r
-typedef struct\r
+/*typedef struct\r
 {\r
        unsigned        RLEWtag;\r
        long            headeroffsets[100];\r
        byte            tileinfo[];\r
-} mapfiletype;\r
+} mapfiletype;*/\r
 \r
 \r
 /*\r
@@ -69,7 +65,7 @@ typedef struct
 =============================================================================\r
 */\r
 \r
-byte           _seg    *tinf;\r
+/*byte                 _seg    *tinf;\r
 int                    mapon;\r
 \r
 unsigned       _seg    *mapsegs[3];\r
@@ -80,7 +76,7 @@ void          _seg    *grsegs[NUMCHUNKS];
 byte           far     grneeded[NUMCHUNKS];\r
 byte           ca_levelbit,ca_levelnum;\r
 \r
-int                    profilehandle,debughandle;\r
+int                    profilehandle,debughandle;*/\r
 \r
 void   (*drawcachebox)         (char *title, unsigned numcache);\r
 void   (*updatecachebox)       (void);\r
@@ -224,7 +220,7 @@ void CAL_GetGrChunkLength (int chunk)
 boolean CA_FarRead (int handle, byte far *dest, long length)\r
 {\r
        if (length>0xffffl)\r
-               Quit ("CA_FarRead doesn't support 64K reads yet!");\r
+               printf("CA_FarRead doesn't support 64K reads yet!\n");\r
 \r
 asm            push    ds\r
 asm            mov     bx,[handle]\r
@@ -364,7 +360,7 @@ boolean CA_LoadFile (char *filename, memptr *ptr)
 ===============\r
 */\r
 \r
-void CAL_OptimizeNodes (huffnode *table)\r
+void CAL_OptimizeNodes(huffnode *table)\r
 {\r
   huffnode *node;\r
   int i;\r
@@ -2187,4 +2183,3 @@ void CA_CacheMarks (char *title)
                if (dialog && finishcachebox)\r
                        finishcachebox();\r
 }\r
-\r

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index 380ae2976af9a98e094399dbfa6022510a8359e8..c4ab670524c092cc8379011a093c0b99340a7e39 100644 (file)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -18,18 +18,10 @@
 \r
 // ID_CA.H\r
 \r
-#ifndef __TYPES__\r
-#include "ID_TYPES.H"\r
-#endif\r
-\r
 #ifndef __ID_MM__\r
 #include "ID_MM.H"\r
 #endif\r
 \r
-#ifndef __ID_GLOB__\r
-#include "ID_GLOB.H"\r
-#endif\r
-\r
 #define __ID_CA__\r
 \r
 //===========================================================================\r
@@ -38,26 +30,26 @@
 //#define NOGRAPHICS\r
 //#define NOAUDIO\r
 \r
-#define MAPHEADERLINKED\r
-#define GRHEADERLINKED\r
-#define AUDIOHEADERLINKED\r
+//#define MAPHEADERLINKED\r
+//#define GRHEADERLINKED\r
+//#define AUDIOHEADERLINKED\r
 \r
-#define NUMMAPS                39\r
-#define MAPPLANES              3\r
+//#define NUMMAPS              39\r
+//#define MAPPLANES            3\r
 \r
 //===========================================================================\r
 \r
-typedef        struct\r
+/*typedef      struct\r
 {\r
        long            planestart[3];\r
        unsigned        planelength[3];\r
        unsigned        width,height;\r
        char            name[16];\r
-} maptype;\r
+} maptype;*/\r
 \r
 //===========================================================================\r
 \r
-extern byte            _seg    *tinf;\r
+/*extern       byte            _seg    *tinf;\r
 extern int                     mapon;\r
 \r
 extern unsigned        _seg    *mapsegs[3];\r
@@ -70,7 +62,7 @@ extern        byte            ca_levelbit,ca_levelnum;
 \r
 extern char            *titleptr[8];\r
 \r
-extern int                     profilehandle,debughandle;\r
+extern int                     profilehandle,debughandle;*/\r
 \r
 //\r
 // hooks for custom cache dialogs\r
@@ -83,8 +75,7 @@ extern        void    (*finishcachebox)       (void);
 \r
 // just for the score box reshifting\r
 \r
-void CAL_ShiftSprite (unsigned segment,unsigned source,unsigned dest,\r
-       unsigned width, unsigned height, unsigned pixshift, boolean domask);\r
+//void CAL_ShiftSprite (unsigned segment,unsigned source,unsigned dest,unsigned width, unsigned height, unsigned pixshift, boolean domask);\r
 \r
 //===========================================================================\r
 \r
@@ -95,19 +86,17 @@ boolean CA_FarWrite (int handle, byte far *source, long length);
 boolean CA_ReadFile (char *filename, memptr *ptr);\r
 boolean CA_LoadFile (char *filename, memptr *ptr);\r
 \r
-long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,\r
-  unsigned rlewtag);\r
+long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);\r
 \r
-void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,\r
-  unsigned rlewtag);\r
+void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);\r
 \r
 void CA_Startup (void);\r
 void CA_Shutdown (void);\r
 \r
-void CA_CacheAudioChunk (int chunk);\r
-void CA_LoadAllSounds (void);\r
+//void CA_CacheAudioChunk (int chunk);\r
+//void CA_LoadAllSounds (void);\r
 \r
-void CA_UpLevel (void);\r
+/*void CA_UpLevel (void);\r
 void CA_DownLevel (void);\r
 \r
 void CA_SetAllPurge (void);\r
@@ -120,5 +109,5 @@ void CA_ClearAllMarks (void);
 void CA_CacheGrChunk (int chunk);\r
 void CA_CacheMap (int mapnum);\r
 \r
-void CA_CacheMarks (char *title);\r
+void CA_CacheMarks (char *title);*/\r
 \r

diff --git a/src/lib/16_head.c b/src/lib/16_head.c
index d56b52607748051ca1c7cee1e6e326021918bc27..6ad9bcc1af20c79193af0825835da3cd2a52af98 100644 (file)
--- a/src/lib/16_head.c
+++ b/src/lib/16_head.c
@@ -163,3 +163,66 @@ US_CheckParm(char *parm,char **strings)
        }\r
        return(-1);\r
 }
+
+/*\r
+==========================\r
+=\r
+= Quit\r
+=\r
+==========================\r
+*/\r
+\r
+/*void Quit(char *error, ...)\r
+{\r
+       short exit_code=0;\r
+       unsigned        finscreen;\r
+\r
+       va_list ap;\r
+\r
+       va_start(ap,error);\r
+\r
+#ifndef CATALOG\r
+       if (!error)\r
+       {\r
+               CA_SetAllPurge ();\r
+               CA_CacheGrChunk (PIRACY);\r
+               finscreen = (unsigned)grsegs[PIRACY];\r
+       }\r
+#endif\r
+\r
+       //ShutdownId ();\r
+\r
+       if (error && *error)\r
+       {\r
+               vprintf(error,ap);\r
+               exit_code = 1;\r
+       }\r
+#ifndef CATALOG\r
+       else\r
+       if (!NoWait)\r
+       {\r
+               movedata (finscreen,0,0xb800,0,4000);\r
+               bioskey (0);\r
+       }\r
+#endif\r
+\r
+       va_end(ap);\r
+\r
+#ifndef CATALOG\r
+       if (!error)\r
+       {\r
+               _argc = 2;\r
+               _argv[1] = "LAST.SHL";\r
+               _argv[2] = "ENDSCN.SCN";\r
+               _argv[3] = NULL;\r
+               if (execv("LOADSCN.EXE", _argv) == -1)\r
+               {\r
+                       clrscr();\r
+                       puts("Couldn't find executable LOADSCN.EXE.\n");\r
+                       exit(1);\r
+               }\r
+       }\r
+#endif\r
+\r
+       exit(exit_code);\r
+}*/

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 225af5d354ee86aac265b88670d2c9b53590c24a..95292d5da43394989fceb6da57036bdda86e4f46 100644 (file)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -142,5 +142,6 @@ void* AllocateLargestFreeBlock(size_t* Size);
 size_t GetFreeSize(void);
 long int filesize(FILE *fp);
 int US_CheckParm(char *parm,char **strings);
+//void Quit(char *error, ...);
 
 #endif/*_LIBHEAD_H_*/