bloody typedefstruct merging is going to be tricky wwww ca_loadfile and ca_readfile...

diff --git a/src/exmmtest.c b/src/exmmtest.c
index e1d4e55809c5903dc8bfc6149745a25a423e33d7..f3871eadebe45611d53a8c7d4314fbfc4a92037d 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -107,10 +107,10 @@ main(int argc, char *argv[])
 //     if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&gvar.mm))\r
 #ifdef FILEREAD\r
        printf("                read\n");\r
-       if(CA_ReadFile(bakapee, &bigbuffer, &gvar.mm))\r
+       if(CA_ReadFile(bakapee, &bigbuffer, &gvar))\r
 #else\r
        printf("                load\n");\r
-       if(CA_LoadFile(bakapee, &bigbuffer, &gvar.mm, &gvar.mmi))\r
+       if(CA_LoadFile(bakapee, &bigbuffer, &gvar))\r
 #endif\r
                baka=1;\r
        else\r

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 0b22ed14de172a390aefc526bd33b4f7e88c5caf..55dca2cd63f09aacf2f55ea9974a96e576510f60 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -221,12 +221,12 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================\r
 */\r
 \r
-boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)\r
+boolean CA_FarRead(int handle, byte huge *dest, dword length, global_game_variables_t *gvar)\r
 {\r
        boolean flag;\r
        //dword fat=0;\r
        //word segm=0;\r
-       if(mm->EMSVer<0x40)\r
+       if(gvar->mm.EMSVer<0x40)\r
        if(length>0xfffflu)\r
        {\r
                printf("File is a fat bakapee\n");\r
@@ -293,12 +293,12 @@ End:
 ==========================\r
 */\r
 \r
-boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)\r
+boolean CA_FarWrite(int handle, byte huge *source, dword length, global_game_variables_t *gvar)\r
 {\r
        boolean flag;\r
        //dword fat=0;\r
        //word segm=0;\r
-       if(mm->EMSVer<0x40)\r
+       if(gvar->mm.EMSVer<0x40)\r
        if(length>0xfffflu)\r
        {\r
                printf("File is a fat bakapee\n");\r
@@ -365,7 +365,7 @@ End:
 ==========================\r
 */\r
 \r
-boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)\r
+boolean CA_ReadFile(char *filename, memptr *ptr, global_game_variables_t *gvar)\r
 {\r
        int handle;\r
        sdword size;\r
@@ -375,7 +375,7 @@ boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
                return false;\r
 \r
        size = filelength(handle);\r
-       if(!CA_FarRead(handle,*ptr,size, mm))\r
+       if(!CA_FarRead(handle,*ptr,size, gvar))\r
        {\r
                close (handle);\r
                return false;\r
@@ -395,7 +395,7 @@ boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
 ==========================\r
 */\r
 \r
-boolean CA_WriteFile (char *filename, void far *ptr, long length, mminfo_t *mm)\r
+boolean CA_WriteFile (char *filename, void far *ptr, long length, global_game_variables_t *gvar)\r
 {\r
        int handle;\r
        sdword size;\r
@@ -407,7 +407,7 @@ boolean CA_WriteFile (char *filename, void far *ptr, long length, mminfo_t *mm)
        if (handle == -1)\r
                return false;\r
 \r
-       if (!CA_FarWrite (handle,ptr,length, mm))\r
+       if (!CA_FarWrite (handle,ptr,length, gvar))\r
        {\r
                close(handle);\r
                return false;\r
@@ -428,7 +428,7 @@ boolean CA_WriteFile (char *filename, void far *ptr, long length, mminfo_t *mm)
 ==========================\r
 */\r
 \r
-boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)\r
+boolean CA_LoadFile(char *filename, memptr *ptr, global_game_variables_t *gvar)\r
 {\r
        int handle;\r
        sdword size;\r
@@ -438,8 +438,8 @@ boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)
                return false;\r
 \r
        size = filelength (handle);\r
-       MM_GetPtr(ptr,size, mm, mmi);\r
-       if(!CA_FarRead(handle,*ptr,size, mm))\r
+       MM_GetPtr(ptr,size, &(gvar->mm), &(gvar->mmi)); //TODO: gvar parameters\r
+       if(!CA_FarRead(handle,*ptr,size, gvar))\r
        {\r
                close(handle);\r
                return false;\r

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index 41649dbfd8a244095e76903347435fb4906f6ca1..203cce952e68cb17cbebade6f560ebc24339c976 100755 (executable)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -90,12 +90,12 @@ extern      void    (*finishcachebox)       (void);
 \r
 void CA_OpenDebug (global_game_variables_t *gvar);\r
 void CA_CloseDebug (global_game_variables_t *gvar);\r
-boolean CA_FarRead (int handle, byte huge *dest, dword length, mminfo_t *mm);\r
-boolean CA_FarWrite (int handle, byte huge *source, dword length, mminfo_t *mm);\r
+boolean CA_FarRead (int handle, byte huge *dest, dword length, global_game_variables_t *gvar);\r
+boolean CA_FarWrite (int handle, byte huge *source, dword length, global_game_variables_t *gvar);\r
 \r
-boolean CA_ReadFile (char *filename, memptr *ptr, mminfo_t *mm);\r
-boolean CA_WriteFile (char *filename, void far *ptr, long length, mminfo_t *mm);\r
-boolean CA_LoadFile (char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi);\r
+boolean CA_ReadFile (char *filename, memptr *ptr, global_game_variables_t *gvar);\r
+boolean CA_WriteFile (char *filename, void far *ptr, long length, global_game_variables_t *gvar);\r
+boolean CA_LoadFile (char *filename, memptr *ptr, global_game_variables_t *gvar);\r
 \r
 long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);\r
 \r

diff --git a/src/vgacamm.c b/src/vgacamm.c
index e9c1c0ba72305651089e39e4ca364dbe064d6224..e77fbc6e805ceebf9cc779bea029b0e66d71a081 100755 (executable)
--- a/src/vgacamm.c
+++ b/src/vgacamm.c
@@ -42,7 +42,7 @@ void main() {
        MM_Startup(&gvar.mm, &gvar.mmi);\r
        CA_Startup(&gvar);\r
        printf("loading\n");\r
-       if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar.mm, &gvar.mmi)) baka=1; else baka=0;\r
+       if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar)) baka=1; else baka=0;\r
 \r
        // DOSLIB: check our environment\r
        probe_dos();\r

diff --git a/src/vrstest.c b/src/vrstest.c
index c36b0ae8bdf7888bae2c0081a40925d599672ce2..0e9020d9e8607b4fbdb4f716c7926bed8303d9ef 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -79,7 +79,7 @@ void main() {
        CA_Startup(&gvar);
        // What should be done by read_vrs:
        //sega = (mm.bufferseg);
-       if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar.mm, &gvar.mmi)) baka=1; else baka=0;
+       if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar)) baka=1; else baka=0;
 
        // Insert sanity cheks later
        vrs.buffer = bigbuffer;