X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.h;h=3cda833ce7b0e4b0f64e34febfb1400ca596998b;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=a8510f1762abc7581fc7c51d25c452ea3faf13c5;hpb=9bd9229921a81b5bd735a2fbf464288400c62503;p=16.git

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