From 71fff90bbd895c10c83e339f93b3a579b50e595b Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 27 Feb 2017 17:20:50 -0600 Subject: [PATCH] hmm where else is PM used... added PM_NextFrame ohh also readded led light control --- _pm_use.txt | 14 ++++++++++++-- _pm_use_.txt | 14 ++++++++++++-- src/lib/16_in.c | 6 ++++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/_pm_use.txt b/_pm_use.txt index f944a7e4..934d267f 100755 --- a/_pm_use.txt +++ b/_pm_use.txt @@ -1,5 +1,6 @@ 16/wf3d8086/contigsc.c: shape = PM_GetSpritePage (shapenum); 16/wf3d8086/contigsc.c: shape = PM_GetSpritePage (shapenum); + 16/wf3d8086/id_sd.c: addr = PM_GetSoundPage(page); 16/wf3d8086/id_sd.c: PM_SetPageLock(PMSoundStart + page,pml_Locked); 16/wf3d8086/id_sd.c: PM_SetPageLock(i + PMSoundStart,pml_Unlocked); @@ -7,37 +8,46 @@ 16/wf3d8086/id_sd.c: PM_CheckMainMem(); 16/wf3d8086/id_sd.c: p = (word far *)MK_FP(PM_GetPage(ChunksInFile - 1),0); 16/wf3d8086/id_sd.c: PM_UnlockMainMem(); -16/wf3d8086/oldscale.c: shape = PM_GetSpritePage (shapenum); -16/wf3d8086/oldscale.c: shape = PM_GetSpritePage (shapenum); + 16/wf3d8086/wl_act2.c: PM_UnlockMainMem (); 16/wf3d8086/wl_act2.c: PM_CheckMainMem (); + 16/wf3d8086/wl_debug.c: addr = PM_GetPageAddress(i); 16/wf3d8086/wl_debug.c: PM_GetPage(j); 16/wf3d8086/wl_debug.c: PM_GetPage(i); + 16/wf3d8086/wl_draw.c: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(wallpic); 16/wf3d8086/wl_draw.c: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(wallpic); 16/wf3d8086/wl_draw.c: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(doorpage); 16/wf3d8086/wl_draw.c: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(doorpage+1); 16/wf3d8086/wl_draw.c: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(wallpic); 16/wf3d8086/wl_draw.c: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(wallpic); + 16/wf3d8086/wl_draw.c: PM_NextFrame(); + 16/wf3d8086/wl_game.c: PM_UnlockMainMem(); 16/wf3d8086/wl_game.c: PM_CheckMainMem (); 16/wf3d8086/wl_game.c: PM_CheckMainMem (); 16/wf3d8086/wl_game.c: PM_CheckMainMem (); 16/wf3d8086/wl_game.c: PM_CheckMainMem (); + 16/wf3d8086/wl_inter.c: PM_Preload (PreloadUpdate); + 16/wf3d8086/wl_main.c: PM_Shutdown (); 16/wf3d8086/wl_main.c: PM_Startup (); 16/wf3d8086/wl_main.c: PM_UnlockMainMem (); + 16/wf3d8086/wl_menu.c: PM_CheckMainMem (); 16/wf3d8086/wl_menu.c: PM_CheckMainMem (); + 16/wf3d8086/wl_play.c: PM_CheckMainMem (); 16/wf3d8086/wl_play.c: PM_CheckMainMem (); 16/wf3d8086/wl_play.c: PM_CheckMainMem (); 16/wf3d8086/wl_play.c: PM_CheckMainMem (); 16/wf3d8086/wl_play.c: PM_CheckMainMem (); + 16/wf3d8086/wl_scale.c: shape = PM_GetSpritePage (shapenum); 16/wf3d8086/wl_scale.c: shape = PM_GetSpritePage (shapenum); + 16/wf3d8086/wolfhack.c: src = PM_GetPage(0); 16/wf3d8086/wolfhack.c: src = PM_GetPage(1); diff --git a/_pm_use_.txt b/_pm_use_.txt index 09041618..23ead100 100755 --- a/_pm_use_.txt +++ b/_pm_use_.txt @@ -1,5 +1,6 @@ 16/wolf3d/WOLFSRC/CONTIGSC.C: shape = PM_GetSpritePage (shapenum); 16/wolf3d/WOLFSRC/CONTIGSC.C: shape = PM_GetSpritePage (shapenum); + 16/wolf3d/WOLFSRC/ID_SD.C: addr = PM_GetSoundPage(page); 16/wolf3d/WOLFSRC/ID_SD.C: PM_SetPageLock(PMSoundStart + page,pml_Locked); 16/wolf3d/WOLFSRC/ID_SD.C: PM_SetPageLock(i + PMSoundStart,pml_Unlocked); @@ -7,37 +8,46 @@ 16/wolf3d/WOLFSRC/ID_SD.C: PM_CheckMainMem(); 16/wolf3d/WOLFSRC/ID_SD.C: p = (word far *)MK_FP(PM_GetPage(ChunksInFile - 1),0); 16/wolf3d/WOLFSRC/ID_SD.C: PM_UnlockMainMem(); -16/wolf3d/WOLFSRC/OLDSCALE.C: shape = PM_GetSpritePage (shapenum); -16/wolf3d/WOLFSRC/OLDSCALE.C: shape = PM_GetSpritePage (shapenum); + 16/wolf3d/WOLFSRC/WL_ACT2.C: PM_UnlockMainMem (); 16/wolf3d/WOLFSRC/WL_ACT2.C: PM_CheckMainMem (); + 16/wolf3d/WOLFSRC/WL_DEBUG.C: addr = PM_GetPageAddress(i); 16/wolf3d/WOLFSRC/WL_DEBUG.C: PM_GetPage(j); 16/wolf3d/WOLFSRC/WL_DEBUG.C: PM_GetPage(i); + 16/wolf3d/WOLFSRC/WL_DRAW.C: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(wallpic); 16/wolf3d/WOLFSRC/WL_DRAW.C: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(wallpic); 16/wolf3d/WOLFSRC/WL_DRAW.C: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(doorpage); 16/wolf3d/WOLFSRC/WL_DRAW.C: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(doorpage+1); 16/wolf3d/WOLFSRC/WL_DRAW.C: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(wallpic); 16/wolf3d/WOLFSRC/WL_DRAW.C: *( ((unsigned *)&postsource)+1) = (unsigned)PM_GetPage(wallpic); + 16/wolf3d/WOLFSRC/WL_DRAW.C: PM_NextFrame(); + 16/wolf3d/WOLFSRC/WL_GAME.C: PM_UnlockMainMem(); 16/wolf3d/WOLFSRC/WL_GAME.C: PM_CheckMainMem (); 16/wolf3d/WOLFSRC/WL_GAME.C: PM_CheckMainMem (); 16/wolf3d/WOLFSRC/WL_GAME.C: PM_CheckMainMem (); 16/wolf3d/WOLFSRC/WL_GAME.C: PM_CheckMainMem (); + 16/wolf3d/WOLFSRC/WL_INTER.C: PM_Preload (PreloadUpdate); + 16/wolf3d/WOLFSRC/WL_MAIN.C: PM_Shutdown (); 16/wolf3d/WOLFSRC/WL_MAIN.C: PM_Startup (); 16/wolf3d/WOLFSRC/WL_MAIN.C: PM_UnlockMainMem (); + 16/wolf3d/WOLFSRC/WL_MENU.C: PM_CheckMainMem (); 16/wolf3d/WOLFSRC/WL_MENU.C: PM_CheckMainMem (); + 16/wolf3d/WOLFSRC/WL_PLAY.C: PM_CheckMainMem (); 16/wolf3d/WOLFSRC/WL_PLAY.C: PM_CheckMainMem (); 16/wolf3d/WOLFSRC/WL_PLAY.C: PM_CheckMainMem (); 16/wolf3d/WOLFSRC/WL_PLAY.C: PM_CheckMainMem (); 16/wolf3d/WOLFSRC/WL_PLAY.C: PM_CheckMainMem (); + 16/wolf3d/WOLFSRC/WL_SCALE.C: shape = PM_GetSpritePage (shapenum); 16/wolf3d/WOLFSRC/WL_SCALE.C: shape = PM_GetSpritePage (shapenum); + 16/wolf3d/WOLFSRC/WOLFHACK.C: src = PM_GetPage(0); 16/wolf3d/WOLFSRC/WOLFHACK.C: src = PM_GetPage(1); diff --git a/src/lib/16_in.c b/src/lib/16_in.c index 938675de..44c6aac1 100755 --- a/src/lib/16_in.c +++ b/src/lib/16_in.c @@ -501,11 +501,17 @@ IN_GetJoyButtonsDB(word joy) static void INL_StartKbd() { + byte far *lock_key; INL_KeyHook = 0; // Clear key hook IN_ClearKeysDown(); OldKeyVect = _dos_getvect(KeyInt); + + // turn off num-lock via BIOS + lock_key = MK_FP(0x040, 0x017); // Pointing to the address of the bios shift state keys + *lock_key&=(~(16 | 32 | 64)); // toggle off the locks by changing the values of the 4th, 5th, and 6th bits of the address byte of 0040:0017 + OldKeyVect(); // call BIOS keyhandler to change keyboard lights _dos_setvect(KeyInt,INL_KeyService); } -- 2.39.2