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

Move num_objects into d_level_object_state

Browse source
This commit is contained in:
Kp 2018-03-12 03:43:46 +00:00
parent 1c92b448c8
commit b63633db51
5 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -175,8 +175,6 @@ extern const collision_outer_array_t CollisionResult;
namespace dcx {
extern int Object_next_signature; // The next signature for the next newly created object
extern int num_objects;
extern int Num_robot_types;
}

1
common/main/object.h
View file

@ -566,6 +566,7 @@ DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES(object, obj, Objects);
struct d_level_object_state
{
unsigned num_objects = 0;
auto &get_objects()
{
return Objects;

4
similar/editor/info.cpp
View file

@ -239,7 +239,9 @@ static void info_display_default(grs_canvas &canvas, int show_all)
//---------------- Number of objects -----------------
if ( old_Num_objects != num_objects ) {
if (old_Num_objects != ObjectState.num_objects)
{
const auto num_objects = ObjectState.num_objects;
old_Num_objects = num_objects;
gr_uprintf(canvas, 0, 32, "Objs: %3d/%3" DXX_PRI_size_type, num_objects, MAX_OBJECTS.value);
}

30
similar/main/object.cpp
View file

@ -105,8 +105,6 @@ static array<objnum_t, MAX_OBJECTS> free_obj_list;
// -- Object stuff
//info on the various types of objects
int num_objects=0;
}
namespace dsx {
@ -838,7 +836,7 @@ void init_objects()
init_player_object();
obj_link_unchecked(vmobjptridx(ConsoleObject), vmsegptridx(segment_first)); //put in the world in segment 0
num_objects = 1; //just the player
ObjectState.num_objects = 1; //just the player
Objects.set_count(1);
}
@ -847,7 +845,7 @@ void init_objects()
//the free list, then set the apporpriate globals
void special_reset_objects(void)
{
num_objects=MAX_OBJECTS;
unsigned num_objects = MAX_OBJECTS;
Objects.set_count(1);
assert(Objects.front().type != OBJ_NONE); //0 should be used
@ -859,6 +857,7 @@ void special_reset_objects(void)
else
if (i > Highest_object_index)
Objects.set_count(i + 1);
ObjectState.num_objects = num_objects;
}
//link the object into the list for its segment
@ -953,10 +952,10 @@ namespace dsx {
imobjptridx_t obj_allocate(d_level_object_state &ObjectState)
{
auto &Objects = ObjectState.get_objects();
if (num_objects >= Objects.size())
if (ObjectState.num_objects >= Objects.size())
return object_none;
const auto objnum = free_obj_list[num_objects++];
const auto objnum = free_obj_list[ObjectState.num_objects++];
if (objnum >= Objects.get_count())
{
Objects.set_count(objnum + 1);
@ -971,8 +970,9 @@ imobjptridx_t obj_allocate(d_level_object_state &ObjectState)
//the object has been unlinked
static void obj_free(objnum_t objnum)
{
free_obj_list[--num_objects] = objnum;
Assert(num_objects >= 0);
const auto num_objects = -- ObjectState.num_objects;
assert(num_objects < free_obj_list.size());
free_obj_list[num_objects] = objnum;
if (objnum == Highest_object_index)
{
@ -1964,20 +1964,18 @@ void compress_objects(void)
}
}
reset_objects(num_objects);
reset_objects(ObjectState.num_objects);
}
//called after load. Takes number of objects, and objects should be
//compressed. resets free list, marks unused objects as unused
void reset_objects(int n_objs)
{
num_objects = n_objs;
ObjectState.num_objects = n_objs;
assert(ObjectState.num_objects > 0);
Objects.set_count(n_objs);
Assert(num_objects>0);
for (objnum_t i = num_objects; i < MAX_OBJECTS; ++i)
for (objnum_t i = n_objs; i < MAX_OBJECTS; ++i)
{
free_obj_list[i] = i;
auto &obj = *vmobjptr(i);
@ -1985,8 +1983,6 @@ void reset_objects(int n_objs)
obj.type = OBJ_NONE;
}
Objects.set_count(num_objects);
Debris_object_count = 0;
}

6
similar/main/weapon.cpp
View file

@ -1341,7 +1341,8 @@ imobjptridx_t spit_powerup(const vmobjptr_t spitter, int id,int seed)
void DropCurrentWeapon (player_info &player_info)
{
if (num_objects >= MAX_USED_OBJECTS)
auto &Objects = ObjectState.get_objects();
if (ObjectState.num_objects >= Objects.size())
return;
powerup_type_t drop_type;
@ -1448,7 +1449,8 @@ void DropSecondaryWeapon (player_info &player_info)
int seed;
ushort sub_ammo=0;
if (num_objects >= MAX_USED_OBJECTS)
auto &Objects = ObjectState.get_objects();
if (ObjectState.num_objects >= Objects.size())
return;
auto &Secondary_weapon = player_info.Secondary_weapon;