From 32cb662f665ce8f2ebe9991d71e186369a2a1c76 Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 21 Oct 2014 03:14:21 +0000 Subject: [PATCH] Remove unused s2s2(S) --- common/include/editor/esegment.h | 3 --- common/main/segment.h | 5 ----- 2 files changed, 8 deletions(-) diff --git a/common/include/editor/esegment.h b/common/include/editor/esegment.h index 39649efee..d03fe9f48 100644 --- a/common/include/editor/esegment.h +++ b/common/include/editor/esegment.h @@ -9,9 +9,6 @@ #include "editor/editor.h" extern segment *Cursegp; // Pointer to current segment in the mine, the one to which things happen. -#ifdef DXX_BUILD_DESCENT_II -#define Curseg2p s2s2(Cursegp) // Pointer to segment2 for Cursegp -#endif #if defined(DXX_BUILD_DESCENT_I) extern segment New_segment; // The segment which can be added to the mine. diff --git a/common/main/segment.h b/common/main/segment.h index 12b946550..6e31e8649 100644 --- a/common/main/segment.h +++ b/common/main/segment.h @@ -231,8 +231,6 @@ struct segment { #define segment2 segment #define Segment2s Segments -// Get pointer to the segment2 for the given segment pointer -#define s2s2(segp) (segp) #define S2F_AMBIENT_WATER 0x01 #define S2F_AMBIENT_LAVA 0x02 @@ -331,9 +329,6 @@ static inline segnum_t operator-(const segment *s, const segment_array_t &S) return segnum_t(static_cast(s - (&*S.begin()))); } -// Get pointer to the segment2 for the given segment pointer -#define s2s2(segp) (segp) - extern const sbyte Side_to_verts[MAX_SIDES_PER_SEGMENT][4]; // Side_to_verts[my_side] is list of vertices forming side my_side. extern const int Side_to_verts_int[MAX_SIDES_PER_SEGMENT][4]; // Side_to_verts[my_side] is list of vertices forming side my_side. extern const char Side_opposite[MAX_SIDES_PER_SEGMENT]; // Side_opposite[my_side] returns side opposite cube from my_side.