X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmemory.c;h=bd3c609b860a429a81d4b01b97a1a2b0db33ba63;hb=bc1fa78a3bca3f391c4b8788d0cea937b9540c0a;hp=d3c5e8ccf8364e55b875f59fa472ab986d460fb4;hpb=2a4083d2b1d0efed86339e7f73b7142c255574a8;p=flatwaifu.git

diff --git a/src/memory.c b/src/memory.c
index d3c5e8c..bd3c609 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -1,100 +1,43 @@
-/*
-   Copyright (C) Prikol Software 1996-1997
-   Copyright (C) Aleksey Volynskov 1996-1997
+/* Copyright (C) 1996-1997 Aleksey Volynskov
+ * Copyright (C) 2011 Rambo
+ * Copyright (C) 2020 SovietPony
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License ONLY.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-   This file is part of the Doom2D:Rembo project.
-
-   Doom2D:Rembo is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
-
-   Doom2D:Rembo is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/> or
-   write to the Free Software Foundation, Inc.,
-   51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-*/
-
-#include "glob.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "error.h"
-#include "files.h"
 #include "memory.h"
+#include "common/wadres.h"
 
-dword dpmi_memavl(void);
-
-extern int d_start,d_end;
-
-extern mwad_t wad[];
-
-static byte m_active=FALSE;
-
-static void *resp[MAX_WAD];
-static short resl[MAX_WAD];
-
-void M_startup(void) {
-  if(m_active) return;
-  logo("M_startup: настройка памяти\n");
-  memset(resp,0,sizeof(resp));
-  memset(resl,0,sizeof(resl));
-  //  logo("  свободно DPMI-памяти: %uK\n",dpmi_memavl()>>10);
-  m_active=TRUE;
+void M_startup (void) {
+  // stub
 }
 
-void M_shutdown(void) {
-
-  if(!m_active) return;
-  m_active=FALSE;
+void M_shutdown (void) {
+  // stub
 }
 
-static void allocres(int h) {
-  int *p,s;
-
-  if(h>d_start && h<d_end) s=1; else s=0;
-  if(!(p=malloc(wad[h].l+4+s*8)))
-    ERR_fatal("M_lock: не хватает памяти");
-  *p=h;
-  ++p;
-  resp[h]=p;
-  if(s) {
-    p[0]=p[1]=p[2]=p[3]=0;
-    F_loadres(h,p,0,2);
-    F_loadres(h,p+1,2,2);
-    F_loadres(h,p+2,4,2);
-    F_loadres(h,p+3,6,2);
-    F_loadres(h,p+4,8,wad[h].l-8);
-  }else F_loadres(h,p,0,wad[h].l);
+void *M_lock (int id) {
+  return WADRES_lock(id);
 }
 
-void *M_lock(int h) {
-  if(h==-1 || h==0xFFFF) return NULL;
-  h&=-1-0x8000;
-  if(h>=MAX_WAD) ERR_fatal("M_lock: странный номер ресурса");
-  if(!resl[h]) if(!resp[h]) allocres(h);
-  ++resl[h];
-  return resp[h];
-}
-
-void M_unlock(void *p) {
-  int h;
-
-  if(!p) return;
-  h=((int*)p)[-1];
-  if(h>=MAX_WAD) ERR_fatal("M_unlock: странный номер ресурса");
-  if(!resl[h]) return;
-  --resl[h];
+void M_unlock (void *p) {
+  WADRES_unlock(p);
 }
 
-int M_locked (int h) {
-  return (h != -1) && (h != 0xFFFF) && (resl[h & (-1 - 0x8000)] != 0);
+int M_locked (int id) {
+  return WADRES_locked(id);
 }
 
-int M_was_locked (int h) {
-  return (h != -1) && (h != 0xFFFF) && (resp[h & (-1 - 0x8000)] != NULL);
+int M_was_locked (int id) {
+  return WADRES_was_locked(id);
 }