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

Use object helper to iterate over fuelcen segments

Browse source
This commit is contained in:
Kp 2014-07-30 02:52:36 +00:00
parent 6a4ffd84a1
commit 4151a6989b
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
similar/main/fuelcen.cpp
View file

@ -58,6 +58,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "compiler-range_for.h"
#include "partial_range.h"
#include "segiter.h"
// The max number of fuel stations per mine.
@ -362,7 +363,7 @@ static void robotmaker_proc( FuelCenter * robotcen )
{
fix dist_to_player;
vms_vector cur_object_loc; //, direction;
int matcen_num, segnum, objnum;
int matcen_num, segnum;
fix top_time;
vms_vector direction;
@ -445,18 +446,19 @@ static void robotmaker_proc( FuelCenter * robotcen )
// Whack on any robot or player in the matcen segment.
count=0;
segnum = robotcen->segnum;
for (objnum=Segments[segnum].objects;objnum!=object_none;objnum=Objects[objnum].next) {
range_for (auto objp, objects_in(Segments[segnum]))
{
count++;
if ( count > MAX_OBJECTS ) {
Int3();
return;
}
if (Objects[objnum].type==OBJ_ROBOT) {
collide_robot_and_materialization_center(&Objects[objnum]);
if (objp->type==OBJ_ROBOT) {
collide_robot_and_materialization_center(objp);
robotcen->Timer = top_time/2;
return;
} else if (Objects[objnum].type==OBJ_PLAYER ) {
collide_player_and_materialization_center(&Objects[objnum]);
} else if (objp->type==OBJ_PLAYER ) {
collide_player_and_materialization_center(objp);
robotcen->Timer = top_time/2;
return;
}