From 4571ba74c21b77d8a8b0604093a76ba215c1793b Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 2 Jan 2020 19:11:09 +0100
Subject: [PATCH] - merge fixes.

Why does that freaking merger always delete the namespace markers...?
---
 source/blood/src/gib.cpp    | 1 +
 source/blood/src/gib.h      | 2 +-
 source/blood/src/qav.cpp    | 3 ++-
 source/blood/src/screen.cpp | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/blood/src/gib.cpp b/source/blood/src/gib.cpp
index e3201a5b7..dc88dd80c 100644
--- a/source/blood/src/gib.cpp
+++ b/source/blood/src/gib.cpp
@@ -528,3 +528,4 @@ void gibPrecache(void)
         }
     }
 }
+END_BLD_NS
diff --git a/source/blood/src/gib.h b/source/blood/src/gib.h
index d5fc5cb66..53257a703 100644
--- a/source/blood/src/gib.h
+++ b/source/blood/src/gib.h
@@ -75,4 +75,4 @@ void GibSprite(spritetype *pSprite, GIBTYPE nGibType, CGibPosition *pPos, CGibVe
 //void GibFX(int nWall, GIBFX * pGFX, int a3, int a4, int a5, int a6, CGibVelocity * pVel);
 void GibWall(int nWall, GIBTYPE nGibType, CGibVelocity *pVel);
 void gibPrecache(void);
-
+END_BLD_NS
diff --git a/source/blood/src/qav.cpp b/source/blood/src/qav.cpp
index 50c0a3bd4..6f639a11d 100644
--- a/source/blood/src/qav.cpp
+++ b/source/blood/src/qav.cpp
@@ -155,4 +155,5 @@ void QAV::Precache(void)
                 tilePrecacheTile(frames[i].tiles[j].picnum, 0);
         }
     }
-}
\ No newline at end of file
+}
+END_BLD_NS
diff --git a/source/blood/src/screen.cpp b/source/blood/src/screen.cpp
index 4b8e56c35..03b6e897d 100644
--- a/source/blood/src/screen.cpp
+++ b/source/blood/src/screen.cpp
@@ -119,7 +119,7 @@ void scrLoadPLUs(void)
     for (int i = kUserPLUStart; i < MAXPALOOKUPS; i++) {
         DICTNODE* pPlu = gSysRes.Lookup(i, "PLU");
         if (!pPlu) continue;
-        else if (pPlu->size / 256 != 64) { consoleSysMsg("Incorrect filesize of PLU#%d", i); }
+        else if (pPlu->Size() / 256 != 64) { consoleSysMsg("Incorrect filesize of PLU#%d", i); }
         else palookup[i] = (char*)gSysRes.Lock(pPlu);
     }