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

Remove typedef valptridx<T>::array_managed_type managed_type##_array_t

Browse source
This commit is contained in:
Kp 2015-08-22 20:43:04 +00:00
parent cc0e29d7a2
commit 9ed4754009
4 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/include/fwdvalptridx.h
View file

@ -116,6 +116,5 @@ public:
using index_type = derived_type_prefix##num_t; \
using integral_type = derived_type_prefix##num_t; \
}; \
typedef valptridx<managed_type>::array_managed_type managed_type##_array_t; \
extern managed_type##_array_t global_array; \
extern valptridx<managed_type>::array_managed_type global_array; \
DXX_VALPTRIDX_SUBTYPE(DXX_VALPTRIDX_DEFINE_SUBTYPE_TYPEDEF, managed_type, derived_type_prefix)

1
common/main/fwdsegment.h
View file

@ -98,7 +98,6 @@ struct group;
struct vertex;
extern array<vertex, MAX_VERTICES> Vertices;
extern segment_array_t Segments;
extern unsigned Num_segments;
extern unsigned Num_vertices;

5
similar/main/mglobal.cpp
View file

@ -44,7 +44,6 @@ int d_tick_count = 0; // increments every 33.33ms
int d_tick_step = 0; // true once every 33.33ms
// This is the global mine which create_new_mine returns.
segment_array_t Segments;
//lsegment Lsegments[MAX_SEGMENTS];
// Number of vertices in current mine (ie, Vertices, pointed to by Vp)
@ -97,5 +96,5 @@ valptridx<managed_type>::array_managed_type::array_managed_type()
}
#endif
template class valptridx<object>::array_managed_type;
template class valptridx<segment>::array_managed_type;
valptridx<object>::array_managed_type Objects;
valptridx<segment>::array_managed_type Segments;

4
similar/main/object.cpp
View file

@ -104,11 +104,7 @@ static array<objnum_t, MAX_OBJECTS> free_obj_list;
// -- Object stuff
//info on the various types of objects
#ifndef NDEBUG
object Object_minus_one;
#endif
object_array_t Objects;
int num_objects=0;
int Highest_ever_object_index=0;