catacomb3d and wolf3d base for sound with project 16's port of id_sd.c

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

diff --git a/src/lib/16_pm.h b/src/lib/16_pm.h
index a8510f1762abc7581fc7c51d25c452ea3faf13c5..a6001ec9b6d0688b622d8b8f2353de3138ea2fec 100755 (executable)
--- a/src/lib/16_pm.h
+++ b/src/lib/16_pm.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -31,10 +31,10 @@
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_hc.h"\r
 #include "src/lib/16_mm.h"\r
+#include "src/lib/16_ca.h"\r
 #include <dos.h>\r
 \r
-extern boolean pmdebug;\r
-\r
+//#define __PM__NOHOGEMS__\r
 /*//   NOTE! PMPageSize must be an even divisor of EMSPageSize, and >= 1024\r
 #define        EMSPageSize             16384\r
 #define        EMSPageSizeSeg  (EMSPageSize >> 4)\r
@@ -91,8 +91,8 @@ extern        word                    ChunksInFile,
                                                PMSpriteStart,PMSoundStart;\r
 extern PageListStruct  far *PMPages;*///moved to src/lib/typdefst.h\r
 \r
-#define        PM_GetSoundPage(v)      PM_GetPage(PMSoundStart + (v))\r
-#define        PM_GetSpritePage(v)     PM_GetPage(PMSpriteStart + (v))\r
+#define        PM_GetSoundPage(v)      PM_GetPage(gvar->pm.fi.PMSoundStart + (v), gvar)\r
+#define        PM_GetSpritePage(v)     PM_GetPage(gvar->pm.fi.PMSpriteStart + (v), gvar)\r
 \r
 #define        PM_LockMainMem(gvar)    PM_SetMainMemPurge(0, gvar)\r
 #define        PM_UnlockMainMem(gvar)  PM_SetMainMemPurge(3, gvar)\r
@@ -113,4 +113,5 @@ extern      memptr  PM_GetPageAddress(int pagenum, global_game_variables_t *gvar),
                                PM_GetPage(int pagenum, global_game_variables_t *gvar);         // Use this one to cache page\r
 \r
 void PM_SetMainMemPurge(int level, global_game_variables_t *gvar);\r
+void PML_StartupMainMem(global_game_variables_t *gvar);\r
 #endif\r