mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-22 06:59:18 +02:00
reformat: parameters can be made pointer to const
This commit is contained in:
@@ -1080,7 +1080,7 @@ bool TTrack::AddDynamicObject(TDynamicObject *Dynamic)
|
||||
|
||||
constexpr int numPts = 4;
|
||||
|
||||
bool TTrack::CheckDynamicObject(TDynamicObject *Dynamic)
|
||||
bool TTrack::CheckDynamicObject(const TDynamicObject *Dynamic)
|
||||
{ // sprawdzenie, czy pojazd jest przypisany do toru
|
||||
for (const auto dynamic : Dynamics ) {
|
||||
if( dynamic == Dynamic ) {
|
||||
@@ -1090,7 +1090,7 @@ bool TTrack::CheckDynamicObject(TDynamicObject *Dynamic)
|
||||
return false;
|
||||
};
|
||||
|
||||
bool TTrack::RemoveDynamicObject(TDynamicObject *Dynamic)
|
||||
bool TTrack::RemoveDynamicObject(const TDynamicObject *Dynamic)
|
||||
{ // usunięcie pojazdu z listy przypisanych do toru
|
||||
bool result = false;
|
||||
if( *Dynamics.begin() == Dynamic ) {
|
||||
@@ -1201,7 +1201,7 @@ void TTrack::create_map_geometry(std::vector<gfx::basic_vertex> &Bank, const gfx
|
||||
}
|
||||
}
|
||||
|
||||
TTrack *TTrack::Next(TTrack *visitor) {
|
||||
TTrack *TTrack::Next(const TTrack *visitor) {
|
||||
if (eType == tt_Normal) {
|
||||
if (trNext != visitor)
|
||||
return trNext;
|
||||
@@ -1887,7 +1887,7 @@ bool TTrack::Switch(int i, float const t, float const d)
|
||||
return false;
|
||||
};
|
||||
|
||||
bool TTrack::SwitchForced(const int i, TDynamicObject *o)
|
||||
bool TTrack::SwitchForced(const int i, const TDynamicObject *o)
|
||||
{ // rozprucie rozjazdu
|
||||
if (SwitchExtension)
|
||||
if (eType == tt_Switch)
|
||||
|
||||
@@ -262,7 +262,7 @@ public:
|
||||
TTrack *Connected(int s, double &d) const;
|
||||
bool SetConnections(int i);
|
||||
bool Switch(int i, float t = -1.f, float d = -1.f);
|
||||
bool SwitchForced(int i, TDynamicObject *o);
|
||||
bool SwitchForced(int i, const TDynamicObject *o);
|
||||
int CrossSegment(int from, int into);
|
||||
int GetSwitchState() {
|
||||
return SwitchExtension ? SwitchExtension->CurrentIndex : -1; };
|
||||
@@ -276,9 +276,9 @@ public:
|
||||
bool AssignForcedEvents(basic_event *NewEventPlus, basic_event *NewEventMinus);
|
||||
static void QueueEvents( event_sequence const &Events, TDynamicObject const *Owner );
|
||||
static void QueueEvents( event_sequence const &Events, TDynamicObject const *Owner, double Delaylimit );
|
||||
bool CheckDynamicObject(TDynamicObject *Dynamic);
|
||||
bool CheckDynamicObject(const TDynamicObject *Dynamic);
|
||||
bool AddDynamicObject(TDynamicObject *Dynamic);
|
||||
bool RemoveDynamicObject(TDynamicObject *Dynamic);
|
||||
bool RemoveDynamicObject(const TDynamicObject *Dynamic);
|
||||
|
||||
// set origin point
|
||||
void
|
||||
@@ -290,7 +290,7 @@ public:
|
||||
|
||||
gfx::geometrybank_handle extra_map_geometry; // handle for map highlighting
|
||||
|
||||
TTrack *Next(TTrack *visitor);
|
||||
TTrack *Next(const TTrack *visitor);
|
||||
double ActiveLength();
|
||||
|
||||
void create_geometry( gfx::geometrybank_handle const &Bank ); // wypełnianie VBO
|
||||
|
||||
@@ -22,7 +22,7 @@ basic_station Station;
|
||||
|
||||
// exchanges load with consist attached to specified vehicle, operating on specified schedule
|
||||
double
|
||||
basic_station::update_load( TDynamicObject *First, TTrainParameters &Schedule, int const Platform ) {
|
||||
basic_station::update_load( TDynamicObject *First, const TTrainParameters &Schedule, int const Platform ) {
|
||||
|
||||
// TODO: filter out maintenance stops when determining first and last stop
|
||||
auto const firststop { Schedule.StationIndex == 1 };
|
||||
|
||||
@@ -18,7 +18,7 @@ public:
|
||||
// methods
|
||||
// exchanges load with consist attached to specified vehicle, operating on specified schedule; returns: time needed for exchange, in seconds
|
||||
static double
|
||||
update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int Platform );
|
||||
update_load( TDynamicObject *First, const Mtable::TTrainParameters &Schedule, int Platform );
|
||||
};
|
||||
|
||||
namespace simulation {
|
||||
|
||||
Reference in New Issue
Block a user