TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move valptridx subtypes to individual fwd headers

Browse source
This commit is contained in:
Kp 2015-08-22 20:43:04 +00:00
parent a126f72bef
commit 946048c54b
26 changed files with 37 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/include/editor/eswitch.h
View file

@ -26,7 +26,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once
#include "switch.h"
#include "fwdvalptridx.h"
#include "fwdsegment.h"
#ifdef __cplusplus

2
common/include/editor/meddraw.h
View file

@ -26,7 +26,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once
#ifdef __cplusplus
#include "fwdvalptridx.h"
#include "fwdsegment.h"
struct grs_canvas;
struct editor_view;

2
common/include/editor/medmisc.h
View file

@ -26,7 +26,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once
#ifdef __cplusplus
#include "fwdvalptridx.h"
#include "fwdsegment.h"
struct vms_matrix;

2
common/include/editor/medwall.h
View file

@ -26,7 +26,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once
#include <cstdint>
#include "fwdvalptridx.h"
#include "fwdsegment.h"
#ifdef __cplusplus

9
common/include/fwdvalptridx.h
View file

@ -118,12 +118,3 @@ public:
using integral_type = derived_type_prefix##num_t; \
}; \
DXX_VALPTRIDX_SUBTYPE(DXX_VALPTRIDX_DEFINE_SUBTYPE_TYPEDEF, managed_type, derived_type_prefix)
DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE(object, obj, Objects);
DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE(segment, seg, Segments);
#undef DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE
#undef DXX_VALPTRIDX_DEFINE_SUBTYPE_TYPEDEF
#undef DXX_VALPTRIDX_SUBTYPE_VC
#undef DXX_VALPTRIDX_SUBTYPE_C
#undef DXX_VALPTRIDX_SUBTYPE

2
common/main/ai.h
View file

@ -35,11 +35,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#ifdef __cplusplus
#include "pstypes.h"
#include "fwdobject.h"
#include "fwdsegment.h"
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
#include "countarray.h"
#include "aistruct.h"
#endif
#include "fwdvalptridx.h"
struct point_seg;
struct PHYSFS_File;

3
common/main/collide.h
View file

@ -29,7 +29,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#ifdef __cplusplus
#include <cstdint>
#include "fwdvalptridx.h"
#include "fwdobject.h"
#include "fwdsegment.h"
struct vms_vector;
struct laser_parent;

2
common/main/controls.h
View file

@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once
#ifdef __cplusplus
#include "fwdvalptridx.h"
#include "fwdobject.h"
void read_flying_controls(vobjptr_t obj);

3
common/main/digi.h
View file

@ -31,7 +31,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#ifdef __cplusplus
#include "dxxsconf.h"
#include "segnum.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
#include "fwdsegment.h"
#include "compiler-exchange.h"
#include "compiler-type_traits.h"

7
common/main/escort.h
View file

@ -10,13 +10,12 @@
*
*/
#ifndef _ESCORT_H
#define _ESCORT_H
#pragma once
#include "maths.h"
#ifdef __cplusplus
#include "fwdvalptridx.h"
#include "fwdobject.h"
#if defined(DXX_BUILD_DESCENT_I)
static inline void invalidate_escort_goal(void)
@ -41,5 +40,3 @@ extern fix64 Buddy_sorry_time;
#endif
#endif
#endif // _ESCORT_H

3
common/main/fireball.h
View file

@ -30,7 +30,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#ifdef __cplusplus
#include "maths.h"
#include "fwd-partial_range.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
#include "fwdsegment.h"
#include "pack.h"
struct vms_vector;

1
common/main/fuelcen.h
View file

@ -27,6 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#ifdef __cplusplus
#include "pack.h"
#include "fwdobject.h"
#include "fwdsegment.h"
struct vms_vector;

2
common/main/fwd-weapon.h
View file

@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "dxxsconf.h"
#include "compiler-array.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
enum powerup_type_t : uint8_t;

3
common/main/fwdobject.h
View file

@ -14,11 +14,14 @@
#include "segnum.h"
#include "fwdvalptridx.h"
#include "maths.h"
#include "fwdsegment.h"
struct bitmap_index;
struct vms_vector;
struct vms_matrix;
DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE(object, obj, Objects);
static constexpr valptridx<object>::magic_constant<0xfffe> object_guidebot_cannot_reach{};
static constexpr valptridx<object>::magic_constant<0xffff> object_none{};
static constexpr valptridx<object>::magic_constant<0> object_first{};

2
common/main/fwdsegment.h
View file

@ -18,6 +18,8 @@
#include "dxxsconf.h"
#include "compiler-array.h"
DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE(segment, seg, Segments);
static constexpr valptridx<segment>::magic_constant<0xfffe> segment_exit{};
static constexpr valptridx<segment>::magic_constant<0xffff> segment_none{};
static constexpr valptridx<segment>::magic_constant<0> segment_first{};

3
common/main/fwdwall.h
View file

@ -10,7 +10,8 @@
#include <physfs.h>
#include "maths.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
#include "fwdsegment.h"
struct side;

3
common/main/game.h
View file

@ -33,7 +33,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include <cstdint>
#include "pack.h"
#include "segnum.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
#include "fwdsegment.h"
#define DESIGNATED_GAME_FPS 30 // assuming the original intended Framerate was 30
#define DESIGNATED_GAME_FRAMETIME (F1_0/DESIGNATED_GAME_FPS)

2
common/main/gauges.h
View file

@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
struct bitmap_index;
#ifdef __cplusplus
#include "fwdvalptridx.h"
#include "fwdobject.h"
//from gauges.c

3
common/main/hostage.h
View file

@ -26,8 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once
#ifdef __cplusplus
#include "dxxsconf.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
#include "compiler-array.h"
#define HOSTAGE_SIZE i2f(5) // 3d size of a hostage

3
common/main/laser.h
View file

@ -29,9 +29,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "vecmat.h"
#ifdef __cplusplus
#include "objnum.h"
#include "segnum.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
enum weapon_type_t
{

2
common/main/lighting.h
View file

@ -29,8 +29,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "vecmat.h"
#ifdef __cplusplus
#include "fwdobject.h"
#include "fwdsegment.h"
#include "fwdvalptridx.h"
struct g3s_lrgb;

2
common/main/morph.h
View file

@ -32,7 +32,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "dxxsconf.h"
#include "vecmat.h"
#include "pack.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
#include "polyobj.h"
#include "compiler-array.h"

10
common/main/newdemo.h
View file

@ -23,15 +23,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*
*/
#ifndef _NEWDEMO_H
#define _NEWDEMO_H
#pragma once
#ifdef __cplusplus
#include "physfsx.h"
#include "segnum.h"
#include "objnum.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
class object_signature_t;
@ -150,5 +146,3 @@ int newdemo_count_demos();
void newdemo_strip_frames(char *, int);
#endif
#endif // _NEWDEMO_H

2
common/main/powerup.h
View file

@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "fmtcheck.h"
#ifdef __cplusplus
#include "fwdvalptridx.h"
#include "fwdobject.h"
enum powerup_type_t : uint8_t
{

8
common/main/slew.h
View file

@ -23,12 +23,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*
*/
#ifndef _SLEW_H
#define _SLEW_H
#pragma once
#ifdef __cplusplus
#include "fwdvalptridx.h"
#include "fwdobject.h"
//from slew.c
@ -49,5 +47,3 @@ int slew_frame(int dont_check_keys); // Does slew frame
#endif
#endif
#endif /* _SLEW_H */

5
common/main/switch.h
View file

@ -30,9 +30,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#ifdef __cplusplus
#include "pack.h"
#include "segnum.h"
#include "objnum.h"
#include "fwdvalptridx.h"
#include "fwdobject.h"
#include "fwdsegment.h"
#include "compiler-array.h"
#define MAX_TRIGGERS 100