X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmemory.c;h=5be719f55d45d1741146a21e3341a5a1d97be3b1;hb=647924a407f11655babc5450f098ee504fe1d182;hp=af93fa6f7b00a2af6d1a9d5bacd6d0a028e3ee00;hpb=e5c2eddc151a59db4e611a77901732d7c15fde90;p=flatwaifu.git

diff --git a/src/memory.c b/src/memory.c
index af93fa6..5be719f 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -27,18 +27,11 @@
 #include "files.h"
 #include "memory.h"
 
-dword dpmi_memavl(void);
-
-extern int d_start,d_end;
-
-extern mwad_t wad[];
-
-static byte m_active=FALSE;
-
+static byte m_active;
 static void *resp[MAX_WAD];
 static short resl[MAX_WAD];
 
-void M_startup(void) {
+void M_startup (void) {
   if(m_active) return;
   logo("M_startup: настройка памяти\n");
   memset(resp,0,sizeof(resp));
@@ -47,13 +40,12 @@ void M_startup(void) {
   m_active=TRUE;
 }
 
-void M_shutdown(void) {
-
+void M_shutdown (void) {
   if(!m_active) return;
   m_active=FALSE;
 }
 
-static void allocres(int h) {
+static void allocres (int h) {
   int *p,s;
 
   if(h>d_start && h<d_end) s=1; else s=0;
@@ -72,7 +64,7 @@ static void allocres(int h) {
   }else F_loadres(h,p,0,wad[h].l);
 }
 
-void *M_lock(int h) {
+void *M_lock (int h) {
   if(h==-1 || h==0xFFFF) return NULL;
   h&=-1-0x8000;
   if(h>=MAX_WAD) ERR_fatal("M_lock: странный номер ресурса");
@@ -81,7 +73,7 @@ void *M_lock(int h) {
   return resp[h];
 }
 
-void M_unlock(void *p) {
+void M_unlock (void *p) {
   int h;
 
   if(!p) return;
@@ -92,11 +84,9 @@ void M_unlock(void *p) {
 }
 
 int M_locked (int h) {
-  h&=-1-0x8000;
-  return (h != -1) && (h != 0xFFFF) && (resl[h] != 0);
+  return (h != -1) && (h != 0xFFFF) && (resl[h & (-1 - 0x8000)] != 0);
 }
 
 int M_was_locked (int h) {
-  h&=-1-0x8000;
-  return (h != -1) && (h != 0xFFFF) && (resp[h] != NULL);
+  return (h != -1) && (h != 0xFFFF) && (resp[h & (-1 - 0x8000)] != NULL);
 }