Skip to content

Commit

Permalink
satisfied further demands
Browse files Browse the repository at this point in the history
  • Loading branch information
PatrikLundell committed Nov 3, 2024
1 parent 178e89f commit 1db23f4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/vehicle.h
Original file line number Diff line number Diff line change
Expand Up @@ -1824,7 +1824,7 @@ class vehicle
/**
* vehicle is driving itself
*/
void selfdrive( int turn, int acceleration );
void selfdrive( int trn, int acceleration );
/**
* can the helicopter descend/ascend here?
*/
Expand All @@ -1833,11 +1833,11 @@ class vehicle
bool check_is_heli_landed();
/**
* Player is driving the vehicle
* @param turn is turn direction
* @param trn is turn direction
* @param acceleration is acceleration
* @param z for vertical movement - e.g helicopters
*/
void pldrive( Character &driver, int turn, int acceleration, int z = 0 );
void pldrive( Character &driver, int trn, int acceleration, int z = 0 );

/**
* Flags item \p tool with PSEUDO, if it has MOD pocket then a `pseudo_magazine_mod` is
Expand Down
2 changes: 0 additions & 2 deletions src/vehicle_move.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,6 @@ monster *vehicle::get_harnessed_animal() const
return nullptr;
}

// "turn" parameter changed to "trn" to avoid clashing with "turn" operation.
void vehicle::selfdrive( const int trn, const int acceleration )
{
if( !is_towed() && !magic && !get_harnessed_animal() && !has_part( "AUTOPILOT" ) ) {
Expand Down Expand Up @@ -1413,7 +1412,6 @@ bool vehicle::check_heli_ascend( Character &p ) const
return true;
}

// Parameter "turn" changed to "trn" to not clash with operation "turn".
void vehicle::pldrive( Character &driver, const int trn, const int acceleration, const int z )
{
bool is_non_proficient = false;
Expand Down

0 comments on commit 1db23f4

Please sign in to comment.