diff --git a/common/include/fwdvalptridx.h b/common/include/fwdvalptridx.h index eb427525c..d7022caba 100644 --- a/common/include/fwdvalptridx.h +++ b/common/include/fwdvalptridx.h @@ -116,6 +116,5 @@ public: using index_type = derived_type_prefix##num_t; \ using integral_type = derived_type_prefix##num_t; \ }; \ - typedef valptridx::array_managed_type managed_type##_array_t; \ - extern managed_type##_array_t global_array; \ + extern valptridx::array_managed_type global_array; \ DXX_VALPTRIDX_SUBTYPE(DXX_VALPTRIDX_DEFINE_SUBTYPE_TYPEDEF, managed_type, derived_type_prefix) diff --git a/common/main/fwdsegment.h b/common/main/fwdsegment.h index 3d74e2114..f09a63d54 100644 --- a/common/main/fwdsegment.h +++ b/common/main/fwdsegment.h @@ -98,7 +98,6 @@ struct group; struct vertex; extern array Vertices; -extern segment_array_t Segments; extern unsigned Num_segments; extern unsigned Num_vertices; diff --git a/similar/main/mglobal.cpp b/similar/main/mglobal.cpp index 959104d40..71fdc7725 100644 --- a/similar/main/mglobal.cpp +++ b/similar/main/mglobal.cpp @@ -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::array_managed_type::array_managed_type() } #endif -template class valptridx::array_managed_type; -template class valptridx::array_managed_type; +valptridx::array_managed_type Objects; +valptridx::array_managed_type Segments; diff --git a/similar/main/object.cpp b/similar/main/object.cpp index 088de8c62..d5ceca930 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -104,11 +104,7 @@ static array 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;