X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.h;h=a6001ec9b6d0688b622d8b8f2353de3138ea2fec;hb=d0908679d03eacbbbd67420ae2daa6a01f0a0bcc;hp=2a9c368f6b83a73786f1916967435b3bdf7a263a;hpb=e271343a59cfb8fd3afd1f011a3f9ff860057aba;p=16.git

diff --git a/src/lib/16_pm.h b/src/lib/16_pm.h
index 2a9c368f..a6001ec9 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-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -31,12 +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>
 
-#ifdef __DEBUG__
-extern boolean debugpm;
-#endif
-
+//#define __PM__NOHOGEMS__
 /*//	NOTE! PMPageSize must be an even divisor of EMSPageSize, and >= 1024
 #define	EMSPageSize		16384
 #define	EMSPageSizeSeg	(EMSPageSize >> 4)
@@ -93,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)