eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 14:49:19 +02:00
Code Issues 123 Wiki Activity

reformat: functions can be made static

Browse Source
This commit is contained in:
jerrrrycho
2026-07-04 06:09:04 +02:00
parent 1d0d1c015b
commit aeb800283c
66 changed files with 199 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vehicle/Driver.cpp
View File

@@ -452,7 +452,7 @@ void TController::TableClear()
eSignSkip = nullptr; // nic nie pomijamy
};
std::vector<basic_event *> TController::CheckTrackEvent( TTrack *Track, double const fDirection ) const
std::vector<basic_event *> TController::CheckTrackEvent( TTrack *Track, double const fDirection )
{ // sprawdzanie eventów na podanym torze do podstawowego skanowania
std::vector<basic_event *> events;
auto const &eventsequence { ( fDirection > 0 ? Track->m_events2 : Track->m_events1 ) };
@@ -1918,7 +1918,8 @@ TController::~TController()
};
// zamiana kodu rozkazu na opis
std::string TController::Order2Str(TOrders Order) const {
std::string TController::Order2Str(TOrders Order)
{
if( (Order & Change_direction) != 0
&& Order != Change_direction ) {

6
vehicle/Driver.h
View File

@@ -471,7 +471,7 @@ private:
void OrdersInit( double fVel );
void OrdersClear();
void OrdersDump( std::string Neworder, bool Verbose = true );
std::string Order2Str( TOrders Order ) const;
static std::string Order2Str( TOrders Order );
// members
std::string m_assignment;
glm::dvec3 vCommandLocation; // polozenie wskaznika, sygnalizatora lub innego obiektu do ktorego odnosi sie komenda // NOTE: not used
@@ -488,7 +488,7 @@ public:
} //jak jedzie do tyłu to trzeba uwzględniać, że distance jest ujemna
private:
// Ra: metody obsługujące skanowanie toru
std::vector<basic_event *> CheckTrackEvent( TTrack *Track, double fDirection ) const;
static std::vector<basic_event *> CheckTrackEvent( TTrack *Track, double fDirection );
bool TableAddNew();
bool TableNotFound( basic_event const *Event, double Distance ) const;
void TableTraceRoute( double fDistance, TDynamicObject *pVehicle );
@@ -511,7 +511,7 @@ private:
int TableDirection() { return iTableDirection; }
// Ra: stare funkcje skanujące, używane do szukania sygnalizatora z tyłu
bool IsOccupiedByAnotherConsist( TTrack *Track, double Distance );
basic_event *CheckTrackEventBackward( double fDirection, TTrack *Track, TDynamicObject *Vehicle, int Eventdirection = 1, end End = rear );
static basic_event *CheckTrackEventBackward( double fDirection, TTrack *Track, TDynamicObject *Vehicle, int Eventdirection = 1, end End = rear );
TTrack *BackwardTraceRoute( double &fDistance, double &fDirection, TDynamicObject *Vehicle, basic_event *&Event, int Eventdirection = 1, end End = rear, bool Untiloccupied = true );
void SetProximityVelocity( double dist, double vel, glm::dvec3 const *pos );
TCommandType BackwardScan( double Range );

8
vehicle/DynObj.h
View File

@@ -206,7 +206,7 @@ public:
int iAxleFirst; // numer pierwszej osi w kierunku ruchu (oś wiążąca pojazd z torem i wyzwalająca eventy)
float fAxleDist; // rozstaw wózków albo osi do liczenia proporcji zacienienia
glm::vec3 modelRot; // obrot pudła względem świata - do przeanalizowania, czy potrzebne!!!
TDynamicObject * ABuFindNearestObject(glm::vec3 pos, TTrack *Track, TDynamicObject *MyPointer, int &CouplNr );
static TDynamicObject * ABuFindNearestObject(glm::vec3 pos, TTrack *Track, TDynamicObject *MyPointer, int &CouplNr );
glm::dvec3 m_future_movement;
glm::dvec3 m_future_wheels_angle;
@@ -290,7 +290,7 @@ private:
void UpdateDoorRotate(TAnim *pAnim); // animacja drzwi - obrót
void UpdateDoorFold(TAnim *pAnim); // animacja drzwi - składanie
void UpdateDoorPlug(TAnim *pAnim); // animacja drzwi - odskokowo-przesuwne
void UpdatePant(TAnim *pAnim); // animacja pantografu
static void UpdatePant(TAnim *pAnim); // animacja pantografu
void UpdatePlatformTranslate(TAnim *pAnim); // doorstep animation, shift
void UpdatePlatformRotate(TAnim *pAnim); // doorstep animation, rotate
void UpdateMirror(TAnim *pAnim); // mirror animation
@@ -460,7 +460,7 @@ private:
// methods
void ABuLittleUpdate(double ObjSqrDist);
void ABuBogies();
void ABuModelRoll();
static void ABuModelRoll();
void TurnOff();
// update state of load exchange operation
void update_exchange( double Deltatime );
@@ -869,7 +869,7 @@ public:
void
update( double dt, int iter );
// legacy method, checks for presence and height of traction wire for specified vehicle
void
static void
update_traction( TDynamicObject *Vehicle );
// legacy method, sends list of vehicles over network
void

3
vehicle/Train.h
View File

@@ -214,7 +214,8 @@ class TTrain {
void update_sounds_runningnoise( sound_source &Sound );
void update_sounds_resonancenoise( sound_source &Sound );
void update_sounds_radio();
end cab_to_end( int const End ) const {
static end cab_to_end( int const End )
{
return End == 2 ? rear : front; }
end cab_to_end() const {
return cab_to_end( iCabn ); }