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

Remove unnecessary FuelCenter operator-

Browse source
This commit is contained in:
Kp 2016-12-22 05:21:16 +00:00
parent 10aa2e5106
commit 29b9c255fa
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/main/fuelcen.h
View file

@ -144,11 +144,6 @@ extern const char Special_names[MAX_CENTER_TYPES][11];
extern array<matcen_info, MAX_ROBOT_CENTERS> RobotCenters;
extern array<FuelCenter, MAX_NUM_FUELCENS> Station;
static inline long operator-(FuelCenter *s, array<FuelCenter, MAX_NUM_FUELCENS> &a)
{
return std::distance(a.begin(), s);
}
// Called when a materialization center gets triggered by the player
// flying through some trigger!
void trigger_matcen(vsegptridx_t segnum);

20
similar/main/fuelcen.cpp
View file

@ -54,7 +54,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "multibot.h"
#include "escort.h"
#include "poison.h"
#include "d_enumerate.h"
#include "compiler-range_for.h"
#include "partial_range.h"
#include "segiter.h"
@ -349,7 +349,7 @@ objptridx_t create_morph_robot( const vsegptridx_t segp, const vms_vector &obje
}
// ----------------------------------------------------------------------------------------------------------
static void robotmaker_proc( FuelCenter * robotcen )
static void robotmaker_proc(FuelCenter *const robotcen, const unsigned numrobotcen)
{
int matcen_num;
fix top_time;
@ -416,7 +416,7 @@ static void robotmaker_proc( FuelCenter * robotcen )
if (robotcen->Timer > top_time ) {
int count=0;
int my_station_num = robotcen-Station;
int my_station_num = numrobotcen;
// Make sure this robotmaker hasn't put out its max without having any of them killed.
range_for (const auto &&objp, vcobjptr)
@ -505,8 +505,8 @@ static void robotmaker_proc( FuelCenter * robotcen )
const auto &&obj = create_morph_robot(vsegptridx(robotcen->segnum), cur_object_loc, type );
if (obj != object_none) {
if (Game_mode & GM_MULTI)
multi_send_create_robot(robotcen-Station, obj, type);
obj->matcen_creator = (robotcen-Station) | 0x80;
multi_send_create_robot(numrobotcen, obj, type);
obj->matcen_creator = (numrobotcen) | 0x80;
// Make object faces player...
const auto direction = vm_vec_sub(ConsoleObject->pos,obj->pos );
@ -530,12 +530,13 @@ static void robotmaker_proc( FuelCenter * robotcen )
// Called once per frame, replenishes fuel supply.
void fuelcen_update_all()
{
range_for (auto &i, partial_range(Station, Num_fuelcenters))
range_for (auto &&e, enumerate(partial_range(Station, Num_fuelcenters)))
{
auto &i = e.value;
if (i.Type == SEGMENT_IS_ROBOTMAKER)
{
if (! (Game_suspended & SUSP_ROBOTS))
robotmaker_proc(&i);
robotmaker_proc(&i, e.idx);
}
}
}
@ -543,9 +544,10 @@ void fuelcen_update_all()
namespace dsx {
#if defined(DXX_BUILD_DESCENT_I)
#define FUELCEN_SOUND_DELAY (F1_0/3)
constexpr unsigned FUELCEN_SOUND_DELAY = (F1_0 / 3);
#elif defined(DXX_BUILD_DESCENT_II)
#define FUELCEN_SOUND_DELAY (f1_0/4) //play every half second
//play every half second
constexpr unsigned FUELCEN_SOUND_DELAY = (F1_0 / 4);
#endif
//-------------------------------------------------------------

4
similar/main/multibot.cpp
View file

@ -967,7 +967,7 @@ void multi_do_robot_explode(const uint8_t *const buf)
void multi_do_create_robot(const playernum_t pnum, const ubyte *buf)
{
uint_fast32_t fuelcen_num = buf[2];
const uint_fast32_t fuelcen_num = buf[2];
int type = buf[5];
FuelCenter *robotcen;
@ -1002,7 +1002,7 @@ void multi_do_create_robot(const playernum_t pnum, const ubyte *buf)
if (obj == object_none)
return; // Cannot create object!
obj->matcen_creator = (robotcen-Station) | 0x80;
obj->matcen_creator = fuelcen_num | 0x80;
// extract_orient_from_segment(&obj->orient, &Segments[robotcen->segnum]);
const auto direction = vm_vec_sub(ConsoleObject->pos, obj->pos );
vm_vector_2_matrix( obj->orient, direction, &obj->orient.uvec, nullptr);