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

Remove obsolete arguments from DEFINE_VALPTRIDX_SUBTYPE

Browse source
This commit is contained in:
Kp 2016-04-06 03:34:13 +00:00
parent 443b1f2915
commit 608467161b
5 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/include/valptridx.h
View file

@ -714,13 +714,15 @@ public:
void *operator &() const = delete;
};
#define _DEFINE_VALPTRIDX_SUBTYPE_USERTYPE(N,P,I,A,prefix,Pconst) \
constexpr valptridx<P>::basic_ptridx_global_factory<prefix##ptr_t> prefix##ptr{}; \
constexpr valptridx<P>::basic_vptr_global_factory<v##prefix##ptr_t> v##prefix##ptr{}; \
constexpr valptridx<P>::basic_ptridx_global_factory<prefix##ptridx_t> prefix##ptridx{}; \
constexpr valptridx<P>::basic_vptr_global_factory<v##prefix##ptridx_t> v##prefix##ptridx{}; \
#define DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES3(MANAGED_TYPE,FACTORY) \
constexpr valptridx<MANAGED_TYPE>::basic_vptr_global_factory<v##FACTORY##_t> v##FACTORY{}; \
constexpr valptridx<MANAGED_TYPE>::basic_ptridx_global_factory<FACTORY##_t> FACTORY{} \
#define DEFINE_VALPTRIDX_SUBTYPE(N,P,I,A) \
_DEFINE_VALPTRIDX_SUBTYPE_USERTYPE(N,P,I,A,N,); \
_DEFINE_VALPTRIDX_SUBTYPE_USERTYPE(N,P,I,A,c##N,const) \
#define DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES2(MANAGED_TYPE,PREFIX) \
DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES3(MANAGED_TYPE,PREFIX##ptr); \
DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES3(MANAGED_TYPE,PREFIX##ptridx) \
#define DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES(P,N) \
DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES2(P,N); \
DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES2(P,c##N) \

4
common/main/object.h
View file

@ -467,10 +467,10 @@ struct obj_position
#define Highest_object_index (Objects.get_count() - 1)
DEFINE_VALPTRIDX_SUBTYPE(obj, object, objnum_t, Objects);
namespace dsx {
DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES(object, obj);
static inline uint8_t get_hostage_id(const object &o)
{
return o.id;

2
common/main/segment.h
View file

@ -209,7 +209,7 @@ struct group
#define Highest_segment_index (Segments.get_count() - 1)
namespace dsx {
DEFINE_VALPTRIDX_SUBTYPE(seg, segment, segnum_t, Segments);
DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES(segment, seg);
}
#endif

2
common/main/switch.h
View file

@ -157,7 +157,7 @@ struct trigger : public prohibit_void_ptr<trigger>
};
DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE(trigger, trg, Triggers, MAX_TRIGGERS);
DEFINE_VALPTRIDX_SUBTYPE(trg, trigger, trgnum_t, Triggers);
DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES(trigger, trg);
}

2
common/main/wall.h
View file

@ -166,7 +166,7 @@ struct cloaking_wall : public prohibit_void_ptr<cloaking_wall>
};
#endif
DEFINE_VALPTRIDX_SUBTYPE(wall, wall, wallnum_t, Walls);
DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES(wall, wall);
struct wclip : public prohibit_void_ptr<wclip>
{