fix bizarre near/far sprintf problem when gv->pee not initialized by just replacing the

[16.git] / src / lib / typdefst.h

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index a0203ca74a8bb57fe91629029f78b2995b5d6d55..d6cc2b9a635d4de6a3b6b03bef390828b577a2be 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -120,7 +120,7 @@ typedef struct
 } pan_t;\r
 \r
 //video\r
-#define NUMCHUNKS      3016    //keen\r
+#define NUMCHUNKS      416     //keen\r
 \r
 typedef struct\r
 {\r
@@ -155,6 +155,7 @@ typedef struct mmblockstruct
 typedef struct\r
 {\r
        dword   nearheap,farheap,EMSmem,XMSmem,mainmem;\r
+//     boolean         PMStarted, MainPresent, EMSPresent, XMSPresent;\r
 } mminfotype;\r
 \r
 typedef struct\r
@@ -169,10 +170,9 @@ typedef struct
 #ifdef __WATCOMC__\r
        void __near     *nearheap;\r
 #endif\r
-       //byte          EMS_status;\r
-       unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;//TODO: PM use\r
-       //unsigned int EMSVer;\r
+       unsigned int            EMSVer;\r
        word numUMBs,UMBbase[MAXUMBS];\r
+       word                    totalEMSpages, freeEMSpages, EMSpagesmapped, EMSHandle, EMSPageFrame;\r
        //dword numUMBs,UMBbase[MAXUMBS];\r
        //huge mmblocktype      huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;\r
        mmblocktype     far mmblocks[MAXBLOCKS],far *mmhead,far *mmfree,far *mmrover,far *mmnew;\r
@@ -246,8 +246,10 @@ typedef struct
 typedef struct\r
 {\r
        boolean                 EMSPresent;\r
+       unsigned int                    EMSVer;\r
        word                    EMSAvail,EMSPagesAvail,EMSHandle,\r
-                                       EMSPageFrame,EMSPhysicalPage, EMSVer;\r
+                                       EMSPageFrame,EMSPhysicalPage;\r
+       word                    totalEMSpages, freeEMSpages, EMSpagesmapped;\r
        EMSListStruct   EMSList[EMSFrameCount];\r
 } pm_emmi_t;\r
 \r
@@ -255,8 +257,8 @@ typedef struct
 typedef struct\r
 {\r
        boolean                 XMSPresent;\r
-       word                    XMSAvail,XMSPagesAvail,XMSHandle;\r
-       dword                   XMSDriver;      //TODO: changed to word\r
+       word                    XMSAvail,XMSPagesAvail,XMSHandle;//,XMSVer;\r
+       dword                   XMSDriver;\r
        int                             XMSProtectPage;// = -1;\r
 } pm_xmmi_t;\r
 \r
@@ -319,9 +321,9 @@ typedef struct
        byte            ca_levelbit,ca_levelnum;\r
        ca_handle_t     file;           //files to open\r
        ca_mapinfo_t    camap;\r
-       //_seg  *grsegs[NUMCHUNKS];\r
-       //byte          far     grneeded[NUMCHUNKS];\r
-       //huffnode huffnode;\r
+       __SEGA  *grsegs[NUMCHUNKS];\r
+       byte            far     grneeded[NUMCHUNKS];\r
+       huffnode huffnode;\r
 } ca_t;\r
 \r
 //==========================================================================\r
@@ -332,10 +334,11 @@ typedef struct
        video_t video;  // video settings variable\r
        ca_t            ca;     // ca stuff\r
        pm_t            pm;     // pm stuff\r
-       byte *pee;              // message for fps\r
        loghandle_t handle;     //handles for file logging\r
        kurokku_t kurokku;      //clock struct\r
        mminfo_t mm; mminfotype mmi;\r
 } global_game_variables_t;\r
 \r
+extern char global_temp_status_text[512];\r
+\r
 #endif /* _TYPEDEFSTRUCT_H_ */\r