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

Pass vcsegptr to fuelcen_give_fuel

Browse source
This commit is contained in:
Kp 2015-05-09 17:39:00 +00:00
parent 7eea02e4f8
commit 9a4f7a32bf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/main/fuelcen.h
View file

@ -73,7 +73,7 @@ objptridx_t create_morph_robot(vsegptridx_t segp, const vms_vector &object_pos,
// Returns the amount of fuel/shields this segment can give up. // Returns the amount of fuel/shields this segment can give up.
// Can be from 0 to 100. // Can be from 0 to 100.
fix fuelcen_give_fuel(vsegptr_t segp, fix MaxAmountCanTake ); fix fuelcen_give_fuel(vcsegptr_t segp, fix MaxAmountCanTake);
// Call once per frame. // Call once per frame.
void fuelcen_update_all(); void fuelcen_update_all();
@ -84,7 +84,7 @@ void fuelcen_update_all();
#if defined(DXX_BUILD_DESCENT_I) #if defined(DXX_BUILD_DESCENT_I)
#define MAX_NUM_FUELCENS 50 #define MAX_NUM_FUELCENS 50
#elif defined(DXX_BUILD_DESCENT_II) #elif defined(DXX_BUILD_DESCENT_II)
fix repaircen_give_shields(vsegptr_t segp, fix MaxAmountCanTake ); fix repaircen_give_shields(vcsegptr_t segp, fix MaxAmountCanTake);
#define MAX_NUM_FUELCENS 70 #define MAX_NUM_FUELCENS 70
#endif #endif

6
similar/main/fuelcen.cpp
View file

@ -77,7 +77,7 @@ array<matcen_info, MAX_ROBOT_CENTERS> RobotCenters;
array<FuelCenter, MAX_NUM_FUELCENS> Station; array<FuelCenter, MAX_NUM_FUELCENS> Station;
unsigned Num_fuelcenters; unsigned Num_fuelcenters;
segment * PlayerSegment= NULL; const segment *PlayerSegment;
#ifdef EDITOR #ifdef EDITOR
const char Special_names[MAX_CENTER_TYPES][11] = { const char Special_names[MAX_CENTER_TYPES][11] = {
@ -553,7 +553,7 @@ void fuelcen_update_all()
#endif #endif
//------------------------------------------------------------- //-------------------------------------------------------------
fix fuelcen_give_fuel(const vsegptr_t segp, fix MaxAmountCanTake ) fix fuelcen_give_fuel(const vcsegptr_t segp, fix MaxAmountCanTake)
{ {
static fix64 last_play_time = 0; static fix64 last_play_time = 0;
PlayerSegment = segp; PlayerSegment = segp;
@ -614,7 +614,7 @@ fix fuelcen_give_fuel(const vsegptr_t segp, fix MaxAmountCanTake )
// DM/050904 // DM/050904
// Repair centers // Repair centers
// use same values as fuel centers // use same values as fuel centers
fix repaircen_give_shields(const vsegptr_t segp, fix MaxAmountCanTake ) fix repaircen_give_shields(const vcsegptr_t segp, fix MaxAmountCanTake)
{ {
static fix last_play_time=0; static fix last_play_time=0;