From e43df2993fd06e7e3acefdb58a08a8f47b7b4e68 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Mon, 30 Dec 2019 12:33:24 +0100
Subject: [PATCH] Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it
can compile.
---
src/p_setup.c | 58 +++++++++++++++++++++++++--------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/p_setup.c b/src/p_setup.c
index 2334a9a03a..09ef07c1a3 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1478,6 +1478,35 @@ static void TextmapParse(UINT32 dataPos, size_t num, void (*parser)(UINT32, char
Z_Free(open);
}
+/** Provides a fix to the flat alignment coordinate transform from standard Textmaps.
+ */
+static void TextmapFixFlatOffsets (sector_t* sec)
+{
+ if (sec->floorpic_angle)
+ {
+ fixed_t pc = FINECOSINE(sec->floorpic_angle>>ANGLETOFINESHIFT);
+ fixed_t ps = FINESINE (sec->floorpic_angle>>ANGLETOFINESHIFT);
+ fixed_t xoffs = sec->floor_xoffs;
+ fixed_t yoffs = sec->floor_yoffs;
+ #define MAXFLATSIZE (2048<<FRACBITS)
+ sec->floor_xoffs = (FixedMul(xoffs, pc) % MAXFLATSIZE) - (FixedMul(yoffs, ps) % MAXFLATSIZE);
+ sec->floor_yoffs = (FixedMul(xoffs, ps) % MAXFLATSIZE) + (FixedMul(yoffs, pc) % MAXFLATSIZE);
+ #undef MAXFLATSIZE
+ }
+
+ if (sec->ceilingpic_angle)
+ {
+ fixed_t pc = FINECOSINE(sec->ceilingpic_angle>>ANGLETOFINESHIFT);
+ fixed_t ps = FINESINE (sec->ceilingpic_angle>>ANGLETOFINESHIFT);
+ fixed_t xoffs = sec->ceiling_xoffs;
+ fixed_t yoffs = sec->ceiling_yoffs;
+ #define MAXFLATSIZE (2048<<FRACBITS)
+ sec->ceiling_xoffs = (FixedMul(xoffs, pc) % MAXFLATSIZE) - (FixedMul(yoffs, ps) % MAXFLATSIZE);
+ sec->ceiling_yoffs = (FixedMul(xoffs, ps) % MAXFLATSIZE) + (FixedMul(yoffs, pc) % MAXFLATSIZE);
+ #undef MAXFLATSIZE
+ }
+}
+
/** Loads the textmap data, after obtaining the elements count and allocating their respective space.
*/
static void P_LoadTextmap (void)
@@ -1562,35 +1591,6 @@ static void P_LoadTextmap (void)
}
}
-/** Provides a fix to the flat alignment coordinate transform from standard Textmaps.
- */
-static void TextmapFixFlatOffsets (sector_t* sec)
-{
- if (sec->floorpic_angle)
- {
- fixed_t pc = FINECOSINE(sec->floorpic_angle>>ANGLETOFINESHIFT);
- fixed_t ps = FINESINE (sec->floorpic_angle>>ANGLETOFINESHIFT);
- fixed_t xoffs = sec->floor_xoffs;
- fixed_t yoffs = sec->floor_yoffs;
- #define MAXFLATSIZE (2048<<FRACBITS)
- sec->floor_xoffs = (FixedMul(xoffs, pc) % MAXFLATSIZE) - (FixedMul(yoffs, ps) % MAXFLATSIZE);
- sec->floor_yoffs = (FixedMul(xoffs, ps) % MAXFLATSIZE) + (FixedMul(yoffs, pc) % MAXFLATSIZE);
- #undef MAXFLATSIZE
- }
-
- if (sec->ceilingpic_angle)
- {
- fixed_t pc = FINECOSINE(sec->ceilingpic_angle>>ANGLETOFINESHIFT);
- fixed_t ps = FINESINE (sec->ceilingpic_angle>>ANGLETOFINESHIFT);
- fixed_t xoffs = sec->ceiling_xoffs;
- fixed_t yoffs = sec->ceiling_yoffs;
- #define MAXFLATSIZE (2048<<FRACBITS)
- sec->ceiling_xoffs = (FixedMul(xoffs, pc) % MAXFLATSIZE) - (FixedMul(yoffs, ps) % MAXFLATSIZE);
- sec->ceiling_yoffs = (FixedMul(xoffs, ps) % MAXFLATSIZE) + (FixedMul(yoffs, pc) % MAXFLATSIZE);
- #undef MAXFLATSIZE
- }
-}
-
static void P_LoadMapData(const virtres_t *virt)
{
virtlump_t* virtvertexes = NULL, * virtsectors = NULL, * virtsidedefs = NULL, * virtlinedefs = NULL, * virtthings = NULL;
--
GitLab