X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.h;h=a6001ec9b6d0688b622d8b8f2353de3138ea2fec;hb=d0908679d03eacbbbd67420ae2daa6a01f0a0bcc;hp=567b953ee76101f784e62201b3d364283cd81beb;hpb=ede5cec5321f853b0c9c3485ee5cd08fb4086985;p=16.git diff --git a/src/lib/16_pm.h b/src/lib/16_pm.h index 567b953e..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. * @@ -32,11 +32,9 @@ #include "src/lib/16_hc.h" #include "src/lib/16_mm.h" #include "src/lib/16_ca.h" -#ifdef __WATCOMC__ -#include "src/lib/16_dbg.h" -#endif #include +//#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)