X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2F16_pm.h;h=a1cce7f61ed88241cae0e1fa63ee63228d2596d9;hb=7499dc78fbb151b6daac45f2643a15bf1b40beb7;hp=4c015e987fd351f39029c6f4f805b821f2d6db43;hpb=2aed15ed3fd65130ae260d4ecd020a4f870f6442;p=16.git diff --git a/src/lib/16_pm.h b/src/lib/16_pm.h index 4c015e98..a1cce7f6 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-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -34,10 +34,7 @@ #include "src/lib/16_ca.h" #include -#ifdef __DEBUG__ -extern boolean dbg_debugpm; -#endif - +//#define __PM__NOHOGEMS__ /*// NOTE! PMPageSize must be an even divisor of EMSPageSize, and >= 1024 #define EMSPageSize 16384 #define EMSPageSizeSeg (EMSPageSize >> 4) @@ -94,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)