16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / lib / 16_ca.c

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index f6ffafb66eef177fa5e2f94a7eee813dad09a076..4a039203e93cdd2d691b67bada601eb01f477e37 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -231,21 +231,9 @@ void CAL_GetGrChunkLength (int chunk,global_game_variables_t *gvar)
 boolean CA_FarRead(int handle, byte far *dest, dword length, global_game_variables_t *gvar)\r
 {\r
        boolean flag=0;\r
-       //dword fat=0;\r
-       //word segm=0;\r
-       if(gvar->pm.emm.EMSVer<0x40)\r
-       if(length>0xfffflu)\r
-       {\r
-               printf("File is a fat bakapee\n");\r
-               //segm=(length%0xfffflu)-1;\r
-               //fat=segm*0xfffflu;\r
-               //length-=fat;\r
-               printf("CA_FarRead doesn't support 64K reads yet!\n");\r
-               return 0;//TODO: EXPAND!!!\r
-       }\r
+       if (length>0xfffflu)\r
+               Quit (gvar, "CA_FarRead doesn't support 64K reads yet!");//TODO: EXPAND!!!\r
 \r
-       //if(!fat&&!segm)\r
-       //{\r
        __asm {\r
                push    ds\r
                mov     bx,[handle]\r
@@ -293,7 +281,7 @@ End:
 /*\r
 ==========================\r
 =\r
-= CA_SegWrite\r
+= CA_FarWrite\r
 =\r
 = Write from a file to a far pointer\r
 =\r
@@ -303,21 +291,9 @@ End:
 boolean CA_FarWrite(int handle, byte far *source, dword length, global_game_variables_t *gvar)\r
 {\r
        boolean flag=0;\r
-       //dword fat=0;\r
-       //word segm=0;\r
-       if(gvar->pm.emm.EMSVer<0x40)\r
-       if(length>0xfffflu)\r
-       {\r
-               printf("File is a fat bakapee\n");\r
-               //segm=(length%0xfffflu)-1;\r
-               //fat=segm*0xfffflu;\r
-               //length-=fat;\r
-               printf("CA_FarWrite doesn't support 64K reads yet!\n");\r
-               return 0;\r
-       }\r
+       if (length>0xfffflu)\r
+               Quit (gvar, "CA_FarWrite doesn't support 64K reads yet!");//TODO: EXPAND!!!\r
 \r
-       //if(!fat&&!segm)\r
-       //{\r
        __asm {\r
                push    ds\r
                mov     bx,[handle]\r
@@ -1451,7 +1427,6 @@ cachein:
 //===========================================================================\r
 \r
 //????#if GRMODE == EGAGR\r
-#if 1\r
 \r
 /*\r
 ======================\r
@@ -1462,10 +1437,9 @@ cachein:
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 unsigned       static  sheight,swidth;\r
 boolean static dothemask;\r
-unsigned       *shifttabletable[8];\r
 \r
 void CAL_ShiftSprite (unsigned segment,unsigned source,unsigned dest,\r
        unsigned width, unsigned height, unsigned pixshift, boolean domask, global_game_variables_t *gvar)\r
@@ -1583,7 +1557,7 @@ dodatabyte:
 }\r
 \r
 #endif\r
-\r
+*/\r
 //===========================================================================\r
 \r
 /*\r
@@ -1595,7 +1569,7 @@ dodatabyte:
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CAL_CacheSprite (int chunk, byte far *compressed, global_game_variables_t *gvar)\r
 {\r
        int i;\r
@@ -1714,7 +1688,7 @@ void CAL_CacheSprite (int chunk, byte far *compressed, global_game_variables_t *
        }\r
 \r
 //#endif\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r