From 599f086fd903416a21871110af5632d45c563eb5 Mon Sep 17 00:00:00 2001
From: nukeykt <alexeytf2@icloud.com>
Date: Mon, 1 Jul 2019 17:29:55 +0900
Subject: [PATCH] Xobjects editor wip

# Conflicts:
#	source/blood/src/mapedit.cpp
---
 source/blood/src/actor.h | 12 ------------
 source/blood/src/db.h    | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/blood/src/actor.h b/source/blood/src/actor.h
index 2b61c5e4a..bf25fa7cb 100644
--- a/source/blood/src/actor.h
+++ b/source/blood/src/actor.h
@@ -177,18 +177,6 @@ extern int gDudeDrag;
 extern short gAffectedSectors[kMaxSectors];
 extern short gAffectedXWalls[kMaxXWalls];
 
-inline void GetSpriteExtents(spritetype *pSprite, int *top, int *bottom)
-{
-    *top = *bottom = pSprite->z;
-    if ((pSprite->cstat & 0x30) != 0x20)
-    {
-        int height = tilesiz[pSprite->picnum].y;
-        int center = height / 2 + picanm[pSprite->picnum].yofs;
-        *top -= (pSprite->yrepeat << 2)*center;
-        *bottom += (pSprite->yrepeat << 2)*(height - center);
-    }
-}
-
 
 inline bool IsPlayerSprite(spritetype *pSprite)
 {
diff --git a/source/blood/src/db.h b/source/blood/src/db.h
index 537e6fb9f..4f8cda8d1 100644
--- a/source/blood/src/db.h
+++ b/source/blood/src/db.h
@@ -293,6 +293,18 @@ static inline int GetWallType(int nWall)
     return wall[nWall].lotag;
 }
 
+inline void GetSpriteExtents(spritetype *pSprite, int *top, int *bottom)
+{
+    *top = *bottom = pSprite->z;
+    if ((pSprite->cstat & 0x30) != 0x20)
+    {
+        int height = tilesiz[pSprite->picnum].y;
+        int center = height / 2 + picanm[pSprite->picnum].yofs;
+        *top -= (pSprite->yrepeat << 2)*center;
+        *bottom += (pSprite->yrepeat << 2)*(height - center);
+    }
+}
+
 void InsertSpriteSect(int nSprite, int nSector);
 void RemoveSpriteSect(int nSprite);
 void InsertSpriteStat(int nSprite, int nStat);